diff mbox series

[GIT,PULL] SCSI fixes for 6.5-rc3

Message ID d75dc295e6ddaebc988f5af3ad6d12fa96948f5e.camel@HansenPartnership.com
State New
Headers
Series [GIT,PULL] SCSI fixes for 6.5-rc3 |

Commit Message

James Bottomley July 24, 2023, 7:16 p.m. UTC 
  Single fix for a potential regression over a misunderstanding of the
blk_get_queue() api.

The patch is available here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

The short changelog is:

Yu Kuai (1):
      scsi: sg: Fix checking return value of blk_get_queue()

And the diffstat:

 drivers/scsi/sg.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

With full diff below.

James

---

 	cdev = cdev_alloc();

Comments

pr-tracker-bot@kernel.org July 24, 2023, 9:55 p.m. UTC | #1 
The pull request you sent on Mon, 24 Jul 2023 15:16:47 -0400:

> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0b5547c51827e053cc754db47d3ec3e6c2c451d2

Thank you!
diff mbox series

Patch

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;