diff --git a/[refs] b/[refs] index 1d30269c799a..3de83734b1ed 100644 --- 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 index af7af958ab3e..b72dde70840a 100644 --- 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; }