diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-04-07 04:46:54 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-04-07 04:46:54 +0300 |
| commit | 5f3ecd74476510382a35e3ac1883ce52eb5903ae (patch) | |
| tree | ca694f62fc98edb940a1cd94561eb3b8d9527c63 /drivers/scsi/sr.c | |
| parent | 3123109284176b1532874591f7c81f3837bbdc17 (diff) | |
| parent | a6b758b0420bda28995ea6939ca0808fcec68be4 (diff) | |
| download | linux-5f3ecd74476510382a35e3ac1883ce52eb5903ae.tar.xz | |
Merge branch '5.18/scsi-queue' into 5.18/scsi-fixes
Pull the remaining commits from 5.18/scsi-queue into fixes.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/sr.c')
| -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 5ba9df334968..cbd92891a762 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -535,7 +535,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; |