diff mbox series

scsi: core: return -ENOMEM on ips_init_phase1() allocation failure

Message ID 1634640655-20667-1-git-send-email-jiapeng.chong@linux.alibaba.com (mailing list archive)
State New, archived
Headers show
Series scsi: core: return -ENOMEM on ips_init_phase1() allocation failure | expand

Commit Message

Jiapeng Chong Oct. 19, 2021, 10:50 a.m. UTC 
From: chongjiapeng <jiapeng.chong@linux.alibaba.com>

Fixes the following smatch warning:

drivers/scsi/ips.c:6901 ips_init_phase1() warn: returning -1 instead of
-ENOMEM is sloppy.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Fixes: dd00cc486ab1 ("some kmalloc/memset ->kzalloc (tree wide)")
Signed-off-by: chongjiapeng <jiapeng.chong@linux.alibaba.com>
---
 drivers/scsi/ips.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Bottomley Oct. 19, 2021, 11:49 a.m. UTC | #1 
On Tue, 2021-10-19 at 18:50 +0800, Jiapeng Chong wrote:
> From: chongjiapeng <jiapeng.chong@linux.alibaba.com>
> 
> Fixes the following smatch warning:
> 
> drivers/scsi/ips.c:6901 ips_init_phase1() warn: returning -1 instead
> of -ENOMEM is sloppy.

Really, like megaraid, it's not.  ips_init_phase1() returns either
Success or -1.  If it returns -1, that gets translated to -ENODEV so,
again, we'd lose this nuanced return completely.

James
diff mbox series

Patch

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 498bf04499ce..2ce97f407d18 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -6898,7 +6898,7 @@  ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
 	if (ha == NULL) {
 		IPS_PRINTK(KERN_WARNING, pci_dev,
 			   "Unable to allocate temporary ha struct\n");
-		return -1;
+		return -ENOMEM;
 	}
 
 	ips_sh[index] = NULL;