lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge HEAD from ../scsi-misc-2.6-tmp

Browse Source
This commit is contained in:
James Bottomley
2005-08-28 11:18:35 -05:00
parent 392160335c 8224bfa84d
commit 7a93aef7fb
72 changed files with 3837 additions and 8035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/sg.c
View File

@@ -1027,8 +1027,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
if (sdp->detached)
return -ENODEV;
if (filp->f_flags & O_NONBLOCK) {
if (test_bit(SHOST_RECOVERY,
&sdp->device->host->shost_state))
if (sdp->device->host->shost_state == SHOST_RECOVERY)
return -EBUSY;
} else if (!scsi_block_when_processing_errors(sdp->device))
return -EBUSY;