---

yaml --- r: 82687 b: refs/heads/master c: 6db9e46 h: refs/heads/master i: 82685: 3a1c66b 82683: aae738a 82679: bd02e75 82671: 87e2b4e 82655: 596b166 82623: 05d2810 82559: 619eaff 82431: 7b8699f v: v3
git-mirror · Feb 3, 2008 · 2fedd35 · 2fedd35
1 parent f8eede3
commit 2fedd35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ee8e922541a3dea0b53b177a3c5ccbf03631408
+refs/heads/master: 6db9e4617e9bdf9d31fbea165b10cb95318adf8c
diff --git a/trunk/drivers/net/bfin_mac.c b/trunk/drivers/net/bfin_mac.c
@@ -296,7 +296,7 @@ static void mdio_poll(void)
 
 	/* poll the STABUSY bit */
 	while ((bfin_read_EMAC_STAADD()) & STABUSY) {
-		mdelay(10);
+		udelay(1);
 		if (timeout_cnt-- < 0) {
 			printk(KERN_ERR DRV_NAME
 			": wait MDC/MDIO transaction to complete timeout\n");
@@ -551,7 +551,7 @@ static void adjust_tx_list(void)
 	 */
 	if (current_tx_ptr->next->next == tx_list_head) {
 		while (tx_list_head->status.status_word == 0) {
-			mdelay(10);
+			mdelay(1);
 			if (tx_list_head->status.status_word != 0
 			    || !(bfin_read_DMA2_IRQ_STATUS() & 0x08)) {
 				goto adjust_head;