diff options
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 47404f5526f1..b4901b690c9a 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -651,6 +651,7 @@ void ide_timer_expiry (unsigned long data) | |||
651 | } | 651 | } |
652 | } | 652 | } |
653 | hwif->handler = NULL; | 653 | hwif->handler = NULL; |
654 | hwif->expiry = NULL; | ||
654 | /* | 655 | /* |
655 | * We need to simulate a real interrupt when invoking | 656 | * We need to simulate a real interrupt when invoking |
656 | * the handler() function, which means we need to | 657 | * the handler() function, which means we need to |
@@ -830,6 +831,7 @@ irqreturn_t ide_intr (int irq, void *dev_id) | |||
830 | goto out; | 831 | goto out; |
831 | 832 | ||
832 | hwif->handler = NULL; | 833 | hwif->handler = NULL; |
834 | hwif->expiry = NULL; | ||
833 | hwif->req_gen++; | 835 | hwif->req_gen++; |
834 | del_timer(&hwif->timer); | 836 | del_timer(&hwif->timer); |
835 | spin_unlock(&hwif->lock); | 837 | spin_unlock(&hwif->lock); |