summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/smsc
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-08-28 21:50:15 +0300
committerDavid S. Miller <davem@davemloft.net>2015-08-29 23:09:17 +0300
commitf892a84cc890aaaba7bc42daf2e2ee86b0961884 (patch)
tree7e0bb8dbaa0516fe2e6c9cd8273a84bd28f5edae /drivers/net/ethernet/smsc
parent73e6742027f5cb5a7c747d9abab5351b01fd4c74 (diff)
downloadlinux-f892a84cc890aaaba7bc42daf2e2ee86b0961884.tar.xz
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/net/ethernet/smsc')
-rw-r--r--drivers/net/ethernet/smsc/smsc911x.c5
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;