summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuoqing Jiang <guoqing.jiang@cloud.ionos.com>2019-09-26 15:13:44 +0200
committerDavid S. Miller <davem@davemloft.net>2020-01-20 13:38:26 +0100
commit77df3500a75d946b3f60112a5207900e29e13b68 (patch)
tree28d0f04b1e1b96655b9a63b37c9c539453899e79
parentide: tx4939ide: Fix the name used in a 'devm_request_mem_region()' call (diff)
downloadlinux-77df3500a75d946b3f60112a5207900e29e13b68.tar.xz
linux-77df3500a75d946b3f60112a5207900e29e13b68.zip
ide: remove unnecessary touch_softlockup_watchdog
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>
-rw-r--r--drivers/ide/ide-iops.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index d1445d74e9c3..f2be127ee96e 100644
--- 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;