diff options
| author |   Kevin Groeneveld <kgroeneveld@lenbrook.com> | 2022-03-22 20:22:42 -0400 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2022-03-29 23:37:45 -0400 |
| commit | bc5519c18a32ce855bb51b9f5eceb77a9489d080 (patch) | |
| tree | 8da9612a7e0fc4f98a8753b22f6134590827ccf1 | |
| parent | scsi: pmcraid: Remove the PMCRAID_PASSTHROUGH_IOCTL ioctl implementation (diff) | |
| download | linux-dev-bc5519c18a32ce855bb51b9f5eceb77a9489d080.tar.xz linux-dev-bc5519c18a32ce855bb51b9f5eceb77a9489d080.zip | |
scsi: sr: Fix typo in CDROM(CLOSETRAY|EJECT) handling
Commit 2e27f576abc6 ("scsi: scsi_ioctl: Call scsi_cmd_ioctl() from
scsi_ioctl()") seems to have a typo as it is checking ret instead of cmd in
the if statement checking for CDROMCLOSETRAY and CDROMEJECT. This changes
the behaviour of these ioctls as the cdrom_ioctl handling of these is more
restrictive than the scsi_ioctl version.
Link: https://lore.kernel.org/r/20220323002242.21157-1-kgroeneveld@lenbrook.com
Fixes: 2e27f576abc6 ("scsi: scsi_ioctl: Call scsi_cmd_ioctl() from scsi_ioctl()")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kevin Groeneveld <kgroeneveld@lenbrook.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index aaa54ad5f035..f232514f5a2b 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -578,7 +578,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, scsi_autopm_get_device(sdev); - if (ret != CDROMCLOSETRAY && ret != CDROMEJECT) { + if (cmd != CDROMCLOSETRAY && cmd != CDROMEJECT) { ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg); if (ret != -ENOSYS) goto put; |