diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 22:28:35 +0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 22:28:35 +0400 |
| commit | 9bd7de51ee8537094656149eaf45338cadb7d7d4 (patch) | |
| tree | a691987319dfcdb07de2bce619746f88d26882c4 /drivers/ide/ide-io.c | |
| parent | e4b636366c00738b9609cda307014d71b1225b7f (diff) | |
| parent | 6a44587ee716ac911082cbdec766e5b3f051c071 (diff) | |
| download | linux-9bd7de51ee8537094656149eaf45338cadb7d7d4.tar.xz | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/ide/ide-io.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
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 e4e3a0e3201e..bba4297f2f03 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -704,7 +704,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) { rq_in_flight = hwif->rq; hwif->rq = NULL; ide_unlock_port(hwif); @@ -879,7 +879,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); rq_in_flight = hwif->rq; hwif->rq = NULL; |