diff options
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index b92e2dac9aa9..2fb8d4d2d6f6 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -524,7 +524,8 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd, | |||
| 524 | * case fall through to scsi_ioctl, which will return ENDOEV again | 524 | * case fall through to scsi_ioctl, which will return ENDOEV again |
| 525 | * if it doesn't recognise the ioctl | 525 | * if it doesn't recognise the ioctl |
| 526 | */ | 526 | */ |
| 527 | ret = scsi_nonblockable_ioctl(sdev, cmd, argp, NULL); | 527 | ret = scsi_nonblockable_ioctl(sdev, cmd, argp, |
| 528 | file ? file->f_flags & O_NDELAY : 0); | ||
| 528 | if (ret != -ENODEV) | 529 | if (ret != -ENODEV) |
| 529 | return ret; | 530 | return ret; |
| 530 | return scsi_ioctl(sdev, cmd, argp); | 531 | return scsi_ioctl(sdev, cmd, argp); |