summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-02-03 12:04:55 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 17:32:12 +0100
commit6842f8c8dac7c06cbf0aac87824f1ff337be31cb (patch)
tree7e1e185607d4c6134963d6106af7b3f311c9e976 /drivers/ide
parent[PATCH] stop CompactFlash devices being marked as removable (diff)
downloadlinux-6842f8c8dac7c06cbf0aac87824f1ff337be31cb.tar.xz
linux-6842f8c8dac7c06cbf0aac87824f1ff337be31cb.zip
[PATCH] solve false-positive soft lockup messages during IDE init
Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Rogio Brito <rbrito@ime.usp.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-iops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index af7af958ab3e..b72dde70840a 100644
--- a/drivers/ide/ide-iops.c
+++ b/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;
}