Merge /spare/repo/netdev-2.6 branch 'ieee80211'

[firefly-linux-kernel-4.4.55.git] / drivers / net / pcnet32.c

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 13f114876965ba1d26f3bc2c604037d409213fa5..3213f3e50487cee1076d9d69407ea520108bbd07 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -850,7 +850,7 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)
     if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ)))
     data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
 
-    schedule_timeout(data * HZ);
+    msleep_interruptible(data * 1000);
     del_timer_sync(&lp->blink_timer);
 
     /* Restore the original value of the bcrs */