aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi_lib.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-15 11:26:53 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-15 11:26:53 -0400
commitefa6e7e9d40fe01406d889a5bed62f2e0da49bff (patch)
tree7f856e4c4264a2e51768610f4b883ef023152f27 /drivers/scsi/scsi_lib.c
parent5006ecc2d5073d4e52f54381fd0fee1575d4ce22 (diff)
parentaee10a03eb3e240bfd1a6f91e06ce82df47c5c58 (diff)
Merge branch 'for-jeff' of git://htj.dyndns.org/libata-tj into tejun-merge
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r--drivers/scsi/scsi_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 764a8b375ea..18e34775b23 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -566,7 +566,7 @@ void scsi_device_unbusy(struct scsi_device *sdev)
spin_lock_irqsave(shost->host_lock, flags);
shost->host_busy--;
if (unlikely(scsi_host_in_recovery(shost) &&
- shost->host_failed))
+ (shost->host_failed || shost->host_eh_scheduled)))
scsi_eh_wakeup(shost);
spin_unlock(shost->host_lock);
spin_lock(sdev->request_queue->queue_lock);