Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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;