diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-31 07:45:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-31 07:45:01 +0300 |
| commit | 06fb4e701b17e93366542e4cc57047e411136af7 (patch) | |
| tree | e68d4bce91bf3fa82f6a76c424d1d18d222d6638 /drivers/net/ethernet/renesas | |
| parent | 2573d78872f242a05b842e9c553da45a3d9924e5 (diff) | |
| parent | f892a84cc890aaaba7bc42daf2e2ee86b0961884 (diff) | |
| download | linux-06fb4e701b17e93366542e4cc57047e411136af7.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/renesas')
| -rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 |
2 files changed, 2 insertions, 4 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) ndev->dma = -1; irq = platform_get_irq(pdev, 0); if (irq < 0) { - error = -ENODEV; + error = irq; goto out_release; } 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) ndev->dma = -1; ret = platform_get_irq(pdev, 0); - if (ret < 0) { - ret = -ENODEV; + if (ret < 0) goto out_release; - } ndev->irq = ret; SET_NETDEV_DEV(ndev, &pdev->dev); |