| From 41196586b8e41805b8321cbcb04e511d61610862 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 22 Mar 2022 20:22:42 -0400 |
| Subject: scsi: sr: Fix typo in CDROM(CLOSETRAY|EJECT) handling |
| |
| From: Kevin Groeneveld <kgroeneveld@lenbrook.com> |
| |
| [ Upstream commit bc5519c18a32ce855bb51b9f5eceb77a9489d080 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/sr.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c |
| index f5a2eed54345..9f683fed8f2c 100644 |
| --- a/drivers/scsi/sr.c |
| +++ b/drivers/scsi/sr.c |
| @@ -579,7 +579,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; |
| -- |
| 2.35.1 |
| |
