]> git.karo-electronics.de Git - linux-beck.git/commitdiff
fsl/fman: fix error return code in mac_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 17 Oct 2016 15:19:56 +0000 (15:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Oct 2016 17:16:52 +0000 (13:16 -0400)
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 3933961682a3 ("fsl/fman: Add FMan MAC driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fman/mac.c

index 8fe6b3e253fa436f0cc87bf8702b827f3b6d9a72..cc5d07cfe535fb9a9cec20f02a9f2e85fedadda2 100644 (file)
@@ -879,13 +879,17 @@ static int mac_probe(struct platform_device *_of_dev)
 
                priv->fixed_link = kzalloc(sizeof(*priv->fixed_link),
                                           GFP_KERNEL);
-               if (!priv->fixed_link)
+               if (!priv->fixed_link) {
+                       err = -ENOMEM;
                        goto _return_dev_set_drvdata;
+               }
 
                priv->phy_node = of_node_get(mac_node);
                phy = of_phy_find_device(priv->phy_node);
-               if (!phy)
+               if (!phy) {
+                       err = -EINVAL;
                        goto _return_dev_set_drvdata;
+               }
 
                priv->fixed_link->link = phy->link;
                priv->fixed_link->speed = phy->speed;