Merge Linus master into drm-next

[linux-2.6-microblaze.git] / drivers / phy / phy-spear1310-miphy.c

diff --git a/drivers/phy/phy-spear1310-miphy.c b/drivers/phy/phy-spear1310-miphy.c
index 9f47fae..65ae640 100644 (file)
--- a/drivers/phy/phy-spear1310-miphy.c
+++ b/drivers/phy/phy-spear1310-miphy.c
@@ -192,14 +192,14 @@ static struct phy *spear1310_miphy_xlate(struct device *dev,
 
        if (args->args_count < 1) {
                dev_err(dev, "DT did not pass correct no of args\n");
-               return NULL;
+               return ERR_PTR(-ENODEV);
        }
 
        priv->mode = args->args[0];
 
        if (priv->mode != SATA && priv->mode != PCIE) {
                dev_err(dev, "DT did not pass correct phy mode\n");
-               return NULL;
+               return ERR_PTR(-ENODEV);
        }
 
        return priv->phy;