diff options
Diffstat (limited to 'drivers/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 6f25da56a169..a444bad7a2aa 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -659,8 +659,7 @@ void ide_timer_expiry (struct timer_list *t) spin_unlock(&hwif->lock); /* disable_irq_nosync ?? */ disable_irq(hwif->irq); - /* local CPU only, as if we were handling an interrupt */ - local_irq_disable(); + if (hwif->polling) { startstop = handler(drive); } else if (drive_is_ready(drive)) { @@ -679,6 +678,7 @@ void ide_timer_expiry (struct timer_list *t) startstop = ide_error(drive, "irq timeout", hwif->tp_ops->read_status(hwif)); } + /* Disable interrupts again, `handler' might have enabled it */ spin_lock_irq(&hwif->lock); enable_irq(hwif->irq); if (startstop == ide_stopped && hwif->polling == 0) { |