diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 65bc130430e287ac919bba0c0ab7a2bc06396a95..3cce75d70263a4fd5b315e53241548f3b23a8012 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1754,7 +1754,8 @@ __mega_busywait_mbox (adapter_t *adapter)
 	for (counter = 0; counter < 10000; counter++) {
 		if (!mbox->m_in.busy)
 			return 0;
-		udelay(100); yield();
+		udelay(100);
+		cond_resched();
 	}
 	return -1;		/* give up after 1 second */
 }