aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Kuai <[email protected]>2023-07-05 10:40:01 +0800
committerMartin K. Petersen <[email protected]>2023-07-19 23:12:13 -0400
commit80b6051085c5fedcb1dfd7b2562a63a83655c4d8 (patch)
treedb735bdc058d9c0148667b134d31371f3396c1a2
parentf4d1a8e011909fee24643f84bd1196e1366c26f2 (diff)
scsi: sg: Fix checking return value of blk_get_queue()
Commit fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") make a mess how blk_get_queue() is called, blk_get_queue() returns true on success while the caller expects it returns 0 on success. Fix this problem and also add a corresponding error message on failure. Fixes: fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") Reported-by: Marc Hartmayer <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Yu Kuai <[email protected]> Link: https://lore.kernel.org/r/[email protected] Tested-by: Shin'ichiro Kawasaki <[email protected]> Tested-by: Marc Hartmayer <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Marc Hartmayer <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
-rw-r--r--drivers/scsi/sg.c7
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();