diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-08-28 20:50:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-29 22:09:17 +0200 |
| commit | f892a84cc890aaaba7bc42daf2e2ee86b0961884 (patch) | |
| tree | 7e0bb8dbaa0516fe2e6c9cd8273a84bd28f5edae /drivers | |
| parent | sctp: Do not try to search for the transport twice (diff) | |
| download | linux-f892a84cc890aaaba7bc42daf2e2ee86b0961884.tar.xz linux-f892a84cc890aaaba7bc42daf2e2ee86b0961884.zip | |
net/smsc911x: Fix deferred probe for interrupt
The interrupt handler may not be available when smsc911x probes if the
interrupt handler is a GPIO controller for example. Let's fix that
by adding handling for -EPROBE_DEFER.
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -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 959aeeade0c9..cb9f166f907e 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2435,7 +2435,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; |