Skip to contentSkip to conversation

scsi: mpi3mr: Fix a NULL vs IS_ERR() bug in mpi3mr_bsg_init()

PATCH Applied Dan Carpenter 2 participants 3 messages May 6, 2022 – May 20, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: mpi3mr: Fix a NULL vs IS_ERR() bug in mpi3mr_bsg_init()

The bsg_setup_queue() function does not return NULL. It returns error pointers. Fix the check accordingly.

Fixes 4268fa751365 ("scsi: mpi3mr: Add bsg device support")
---
 drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_app.c +1 -1
index 73bb7992d5a8..8138a728d1ab 100644
@@ -1540,7 +1540,7 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)
 
 	mrioc->bsg_queue = bsg_setup_queue(mrioc->bsg_dev, dev_name(mrioc->bsg_dev),
 			mpi3mr_bsg_request, NULL, 0);
-	if (!mrioc->bsg_queue) {
+	if (IS_ERR(mrioc->bsg_queue)) {
 		ioc_err(mrioc, "%s: bsg registration failed\n",
 		    dev_name(mrioc->bsg_dev));
 		goto err_setup_queue;
Signature · 1 line
2.35.1
#1 lore raw

Dan,

Quoted 2 lines

The bsg_setup_queue() function does not return NULL. It returns error pointers. Fix the check accordingly.

Applied to 5.19/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering