diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2014-05-29 10:54:20 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-06-02 09:55:01 +0200 |
commit | a84d794d5c12a4c118bcdc4fecc2ca76ed02f643 (patch) | |
tree | 3c78bb4366d77e7ae99d7841a77b097aa7aa196a /drivers/scsi | |
parent | 24a4b07879d6d750ef868b94cbdde510d63a1de9 (diff) | |
download | op-kernel-dev-a84d794d5c12a4c118bcdc4fecc2ca76ed02f643.zip op-kernel-dev-a84d794d5c12a4c118bcdc4fecc2ca76ed02f643.tar.gz |
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/hpsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index c5b24e6..af51e7d 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -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); |