diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-24 14:38:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-24 14:38:41 -0700 |
| commit | 0b5547c51827e053cc754db47d3ec3e6c2c451d2 (patch) | |
| tree | c5834eebd61783db5a97adb13b7ff9884d23f690 | |
| parent | 20ea1e7d13c1b544fe67c4a8dc3943bb1ab33e6f (diff) | |
| parent | 80b6051085c5fedcb1dfd7b2562a63a83655c4d8 (diff) | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
"A single fix for a potential regression over a misunderstanding of the
blk_get_queue() api"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: sg: Fix checking return value of blk_get_queue()
| -rw-r--r-- | drivers/scsi/sg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 89fa046c7158..0d8afffd1683 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1497,9 +1497,10 @@ sg_add_device(struct device *cl_dev) int error; unsigned long iflags; - error = blk_get_queue(scsidp->request_queue); - if (error) - return error; + if (!blk_get_queue(scsidp->request_queue)) { + pr_warn("%s: get scsi_device queue failed\n", __func__); + return -ENODEV; + } error = -ENOMEM; cdev = cdev_alloc(); |