diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-21 22:34:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-21 22:34:08 -0400 |
| commit | a3536c839f04682ed06c84a7f75968c27c6108c8 (patch) | |
| tree | 92c26ea74c0ffb9b83a2285ad2539cc271b09856 /drivers/scsi/scsi_ioctl.c | |
| parent | a33a1982012e9070736e3717231714dc9892303b (diff) | |
| parent | efb0372bbaf5b829ff8c39db372779928af542a7 (diff) | |
| download | op-kernel-dev-a3536c839f04682ed06c84a7f75968c27c6108c8.zip op-kernel-dev-a3536c839f04682ed06c84a7f75968c27c6108c8.tar.gz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
| -rw-r--r-- | drivers/scsi/scsi_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index b7fddac..de7f98c 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c @@ -458,7 +458,7 @@ int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, * error processing, as long as the device was opened * non-blocking */ if (filp && filp->f_flags & O_NONBLOCK) { - if (sdev->host->shost_state == SHOST_RECOVERY) + if (scsi_host_in_recovery(sdev->host)) return -ENODEV; } else if (!scsi_block_when_processing_errors(sdev)) return -ENODEV; |
