diff options
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 3d972d819420..450899e9cea2 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c | |||
@@ -1659,7 +1659,7 @@ static int ravb_probe(struct platform_device *pdev) | |||
1659 | ndev->dma = -1; | 1659 | ndev->dma = -1; |
1660 | irq = platform_get_irq(pdev, 0); | 1660 | irq = platform_get_irq(pdev, 0); |
1661 | if (irq < 0) { | 1661 | if (irq < 0) { |
1662 | error = -ENODEV; | 1662 | error = irq; |
1663 | goto out_release; | 1663 | goto out_release; |
1664 | } | 1664 | } |
1665 | ndev->irq = irq; | 1665 | ndev->irq = irq; |
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 7fb244f565b2..257ea713b4c1 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -3089,10 +3089,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev) | |||
3089 | 3089 | ||
3090 | ndev->dma = -1; | 3090 | ndev->dma = -1; |
3091 | ret = platform_get_irq(pdev, 0); | 3091 | ret = platform_get_irq(pdev, 0); |
3092 | if (ret < 0) { | 3092 | if (ret < 0) |
3093 | ret = -ENODEV; | ||
3094 | goto out_release; | 3093 | goto out_release; |
3095 | } | ||
3096 | ndev->irq = ret; | 3094 | ndev->irq = ret; |
3097 | 3095 | ||
3098 | SET_NETDEV_DEV(ndev, &pdev->dev); | 3096 | SET_NETDEV_DEV(ndev, &pdev->dev); |
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index c8b26259c9cf..3b4cd8a263de 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -2428,7 +2428,10 @@ static int smsc911x_drv_probe(struct platform_device *pdev) | |||
2428 | res_size = resource_size(res); | 2428 | res_size = resource_size(res); |
2429 | 2429 | ||
2430 | irq = platform_get_irq(pdev, 0); | 2430 | irq = platform_get_irq(pdev, 0); |
2431 | if (irq <= 0) { | 2431 | if (irq == -EPROBE_DEFER) { |
2432 | retval = -EPROBE_DEFER; | ||
2433 | goto out_0; | ||
2434 | } else if (irq <= 0) { | ||
2432 | pr_warn("Could not allocate irq resource\n"); | 2435 | pr_warn("Could not allocate irq resource\n"); |
2433 | retval = -ENODEV; | 2436 | retval = -ENODEV; |
2434 | goto out_0; | 2437 | goto out_0; |