forked from Minki/linux
hpsa: return -ENOMEM not -1 on kzalloc failure in hpsa_get_device_id
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Mike Miller <michael.miller@canonical.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
24a4b07879
commit
a84d794d5c
@ -2430,7 +2430,7 @@ static int hpsa_get_device_id(struct ctlr_info *h, unsigned char *scsi3addr,
|
|||||||
buflen = 16;
|
buflen = 16;
|
||||||
buf = kzalloc(64, GFP_KERNEL);
|
buf = kzalloc(64, GFP_KERNEL);
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return -1;
|
return -ENOMEM;
|
||||||
rc = hpsa_scsi_do_inquiry(h, scsi3addr, VPD_PAGE | 0x83, buf, 64);
|
rc = hpsa_scsi_do_inquiry(h, scsi3addr, VPD_PAGE | 0x83, buf, 64);
|
||||||
if (rc == 0)
|
if (rc == 0)
|
||||||
memcpy(device_id, &buf[8], buflen);
|
memcpy(device_id, &buf[8], buflen);
|
||||||
|
Loading…
Reference in New Issue
Block a user