diff --git a/[refs] b/[refs]
index f2365fdb87c1..29de3fe0f638 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baf86c9d36826fab0160251bbc87dfab3af48a21
+refs/heads/master: 55029c1d65158aea9672c5dfadb43a57f23e3100
diff --git a/trunk/drivers/net/sfc/mcdi.c b/trunk/drivers/net/sfc/mcdi.c
index 683353b904c7..0d4eba7266ec 100644
--- a/trunk/drivers/net/sfc/mcdi.c
+++ b/trunk/drivers/net/sfc/mcdi.c
@@ -142,8 +142,9 @@ static int efx_mcdi_poll(struct efx_nic *efx)
 		if (spins != 0) {
 			--spins;
 			udelay(1);
-		} else
-			schedule();
+		} else {
+			schedule_timeout_uninterruptible(1);
+		}
 
 		time = get_seconds();