diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-30 21:45:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-30 21:45:01 -0700 |
| commit | 06fb4e701b17e93366542e4cc57047e411136af7 (patch) | |
| tree | e68d4bce91bf3fa82f6a76c424d1d18d222d6638 /drivers/net/ethernet/smsc | |
| parent | 2573d78872f242a05b842e9c553da45a3d9924e5 (diff) | |
| parent | f892a84cc890aaaba7bc42daf2e2ee86b0961884 (diff) | |
| download | linux-06fb4e701b17e93366542e4cc57047e411136af7.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/smsc')
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) res_size = resource_size(res); irq = platform_get_irq(pdev, 0); - if (irq <= 0) { + if (irq == -EPROBE_DEFER) { + retval = -EPROBE_DEFER; + goto out_0; + } else if (irq <= 0) { pr_warn("Could not allocate irq resource\n"); retval = -ENODEV; goto out_0; |