Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / net / phy / mdio-gpio.c

diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index af28ff7ae1767a2c9ec6491c36d48b5797286197..33984b737233c8cb13d9d0dbf9a2e0d6d915601e 100644 (file)
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -202,16 +202,21 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,
 {
        struct device_node *np = NULL;
        struct mdio_gpio_platform_data *pdata;
+       int ret;
 
        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return -ENOMEM;
 
-       pdata->mdc = of_get_gpio(ofdev->node, 0);
-       pdata->mdio = of_get_gpio(ofdev->node, 1);
-
-       if (pdata->mdc < 0 || pdata->mdio < 0)
+       ret = of_get_gpio(ofdev->node, 0);
+       if (ret < 0)
                goto out_free;
+       pdata->mdc = ret;
+
+       ret = of_get_gpio(ofdev->node, 1);
+       if (ret < 0)
+                goto out_free;
+       pdata->mdio = ret;
 
        while ((np = of_get_next_child(ofdev->node, np)))
                if (!strcmp(np->type, "ethernet-phy"))