projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
044b1a9
)
ide: remove unnecessary touch_softlockup_watchdog
author
Guoqing Jiang
<guoqing.jiang@cloud.ionos.com>
Thu, 26 Sep 2019 13:13:44 +0000
(15:13 +0200)
committer
David S. Miller
<davem@davemloft.net>
Mon, 20 Jan 2020 12:38:26 +0000
(13:38 +0100)
Call touch_softlockup_watchdog before touch_nmi_watchdog is not needed,
since touch_softlockup_watchdog is called inside touch_nmi_watchdog.
Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/ide/ide-iops.c
patch
|
blob
|
history
diff --git
a/drivers/ide/ide-iops.c
b/drivers/ide/ide-iops.c
index d1445d74e9c3329e0a4ea85ff14f44a644a9d466..f2be127ee96e61dbb4cf96a3ad4dd4909946c482 100644
(file)
--- a/
drivers/ide/ide-iops.c
+++ b/
drivers/ide/ide-iops.c
@@
-530,7
+530,6
@@
int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
*/
if (stat == 0xff)
return -ENODEV;
- touch_softlockup_watchdog();
touch_nmi_watchdog();
}
return -EBUSY;