summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-05-22 17:10:55 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-05-22 17:10:55 +0200
commit4c9773ed7946fc375edba057770f5ef16d8b44fe (patch)
treecd642c901d6b6f051cbe7a29e6565913e61f0614 /drivers/ide/ide-io.c
parent9f36d31437922354d104a2db407f397e79e4027e (diff)
parent5993856e53fbc4b4f28e2d481deaebeb715b1267 (diff)
downloadlinux-stable-4c9773ed7946fc375edba057770f5ef16d8b44fe.tar.gz
linux-stable-4c9773ed7946fc375edba057770f5ef16d8b44fe.tar.bz2
linux-stable-4c9773ed7946fc375edba057770f5ef16d8b44fe.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c4
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)
}
spin_lock_irq(&hwif->lock);
enable_irq(hwif->irq);
- if (startstop == ide_stopped) {
+ if (startstop == ide_stopped && hwif->polling == 0) {
ide_unlock_port(hwif);
plug_device = 1;
}
@@ -853,7 +853,7 @@ irqreturn_t ide_intr (int irq, void *dev_id)
* same irq as is currently being serviced here, and Linux
* won't allow another of the same (on any CPU) until we return.
*/
- if (startstop == ide_stopped) {
+ if (startstop == ide_stopped && hwif->polling == 0) {
BUG_ON(hwif->handler);
ide_unlock_port(hwif);
plug_device = 1;