---

yaml --- r: 19689 b: refs/heads/master c: 6842f8c h: refs/heads/master i: 19687: 4220aeb v: v3
git-mirror · Feb 3, 2006 · dacd51b · dacd51b
1 parent 31c37cc
commit dacd51b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9810933701a09f9c4dd0ad963d5ec2efb7df07b7
+refs/heads/master: 6842f8c8dac7c06cbf0aac87824f1ff337be31cb
diff --git a/trunk/drivers/ide/ide-iops.c b/trunk/drivers/ide/ide-iops.c
@@ -1243,6 +1243,7 @@ int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
 		 */
 		if (stat == 0xff)
 			return -ENODEV;
+		touch_softlockup_watchdog();
 	}
 	return -EBUSY;
 }