diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-22 11:10:55 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-22 11:10:55 -0400 |
| commit | 4c9773ed7946fc375edba057770f5ef16d8b44fe (patch) | |
| tree | cd642c901d6b6f051cbe7a29e6565913e61f0614 /drivers/ide/ide-io.c | |
| parent | 9f36d31437922354d104a2db407f397e79e4027e (diff) | |
| parent | 5993856e53fbc4b4f28e2d481deaebeb715b1267 (diff) | |
Merge branch 'for-linus' into for-next
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 644d7b4454a6..9654bd34cf52 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -681,7 +681,7 @@ void ide_timer_expiry (unsigned long data) | |||
| 681 | } | 681 | } |
| 682 | spin_lock_irq(&hwif->lock); | 682 | spin_lock_irq(&hwif->lock); |
| 683 | enable_irq(hwif->irq); | 683 | enable_irq(hwif->irq); |
| 684 | if (startstop == ide_stopped) { | 684 | if (startstop == ide_stopped && hwif->polling == 0) { |
| 685 | ide_unlock_port(hwif); | 685 | ide_unlock_port(hwif); |
| 686 | plug_device = 1; | 686 | plug_device = 1; |
| 687 | } | 687 | } |
| @@ -853,7 +853,7 @@ irqreturn_t ide_intr (int irq, void *dev_id) | |||
| 853 | * same irq as is currently being serviced here, and Linux | 853 | * same irq as is currently being serviced here, and Linux |
| 854 | * won't allow another of the same (on any CPU) until we return. | 854 | * won't allow another of the same (on any CPU) until we return. |
| 855 | */ | 855 | */ |
| 856 | if (startstop == ide_stopped) { | 856 | if (startstop == ide_stopped && hwif->polling == 0) { |
| 857 | BUG_ON(hwif->handler); | 857 | BUG_ON(hwif->handler); |
| 858 | ide_unlock_port(hwif); | 858 | ide_unlock_port(hwif); |
| 859 | plug_device = 1; | 859 | plug_device = 1; |