diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-02-04 09:42:09 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-17 14:18:53 -0500 |
commit | ea6d3bc3143a21ec5e1c9330555b36d67979431d (patch) | |
tree | 2a26190cf304fadb06a8d2b4f8ccfbbfeb67dd84 /drivers | |
parent | e89c0ae7babc3e702a9da128b3ac1eb04ed73c2c (diff) |
[SCSI] hpsa: use kzalloc not kmalloc plus memset
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/hpsa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index add2ed578466..bd081fedc3a7 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
@@ -1405,13 +1405,12 @@ static int hpsa_update_device_info(struct ctlr_info *h, | |||
1405 | unsigned char scsi3addr[], struct hpsa_scsi_dev_t *this_device) | 1405 | unsigned char scsi3addr[], struct hpsa_scsi_dev_t *this_device) |
1406 | { | 1406 | { |
1407 | #define OBDR_TAPE_INQ_SIZE 49 | 1407 | #define OBDR_TAPE_INQ_SIZE 49 |
1408 | unsigned char *inq_buff = NULL; | 1408 | unsigned char *inq_buff; |
1409 | 1409 | ||
1410 | inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL); | 1410 | inq_buff = kzalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL); |
1411 | if (!inq_buff) | 1411 | if (!inq_buff) |
1412 | goto bail_out; | 1412 | goto bail_out; |
1413 | 1413 | ||
1414 | memset(inq_buff, 0, OBDR_TAPE_INQ_SIZE); | ||
1415 | /* Do an inquiry to the device to see what it is. */ | 1414 | /* Do an inquiry to the device to see what it is. */ |
1416 | if (hpsa_scsi_do_inquiry(h, scsi3addr, 0, inq_buff, | 1415 | if (hpsa_scsi_do_inquiry(h, scsi3addr, 0, inq_buff, |
1417 | (unsigned char) OBDR_TAPE_INQ_SIZE) != 0) { | 1416 | (unsigned char) OBDR_TAPE_INQ_SIZE) != 0) { |