hpsa: return -ENOMEM not -1 on kzalloc failure in hpsa_get_device_id
authorStephen M. Cameron <scameron@beardog.cce.hp.com>
Thu, 29 May 2014 15:54:20 +0000 (10:54 -0500)
committerChristoph Hellwig <hch@lst.de>
Mon, 2 Jun 2014 07:55:01 +0000 (09:55 +0200)
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>
drivers/scsi/hpsa.c

index c5b24e6..af51e7d 100644 (file)
@@ -2430,7 +2430,7 @@ static int hpsa_get_device_id(struct ctlr_info *h, unsigned char *scsi3addr,
                buflen = 16;
        buf = kzalloc(64, GFP_KERNEL);
        if (!buf)
-               return -1;
+               return -ENOMEM;
        rc = hpsa_scsi_do_inquiry(h, scsi3addr, VPD_PAGE | 0x83, buf, 64);
        if (rc == 0)
                memcpy(device_id, &buf[8], buflen);