projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[powerpc.git]
/
drivers
/
ide
/
ide-iops.c
diff --git
a/drivers/ide/ide-iops.c
b/drivers/ide/ide-iops.c
index
af7af95
..
b72dde7
100644
(file)
--- 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;
}