diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-15 15:26:53 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-15 15:26:53 (GMT) |
| commit | efa6e7e9d40fe01406d889a5bed62f2e0da49bff (patch) | |
| tree | 7f856e4c4264a2e51768610f4b883ef023152f27 /drivers/scsi/scsi_lib.c | |
| parent | 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 (diff) | |
| parent | aee10a03eb3e240bfd1a6f91e06ce82df47c5c58 (diff) | |
| download | linux-fsl-qoriq-efa6e7e9d40fe01406d889a5bed62f2e0da49bff.tar.xz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 764a8b3..18e3477 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); |