diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 12:18:35 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 12:18:35 -0400 |
| commit | 7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c (patch) | |
| tree | 4cd7aae38012dfc1ff6c62be20ef8840e56d8383 /drivers/scsi/sg.c | |
| parent | 392160335c798bbe94ab3aae6ea0c85d32b81bbc (diff) | |
| parent | 8224bfa84d510630b40ea460b2bb380c91acb8ae (diff) | |
Merge HEAD from ../scsi-misc-2.6-tmp
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index e822ca0e97cf..052d55c167d4 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -1027,8 +1027,7 @@ sg_ioctl(struct inode *inode, struct file *filp, | |||
| 1027 | if (sdp->detached) | 1027 | if (sdp->detached) |
| 1028 | return -ENODEV; | 1028 | return -ENODEV; |
| 1029 | if (filp->f_flags & O_NONBLOCK) { | 1029 | if (filp->f_flags & O_NONBLOCK) { |
| 1030 | if (test_bit(SHOST_RECOVERY, | 1030 | if (sdp->device->host->shost_state == SHOST_RECOVERY) |
| 1031 | &sdp->device->host->shost_state)) | ||
| 1032 | return -EBUSY; | 1031 | return -EBUSY; |
| 1033 | } else if (!scsi_block_when_processing_errors(sdp->device)) | 1032 | } else if (!scsi_block_when_processing_errors(sdp->device)) |
| 1034 | return -EBUSY; | 1033 | return -EBUSY; |