diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-02-04 08:42:09 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-17 13:18:53 -0600 |
| commit | ea6d3bc3143a21ec5e1c9330555b36d67979431d (patch) | |
| tree | 2a26190cf304fadb06a8d2b4f8ccfbbfeb67dd84 | |
| 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>
| -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 add2ed57846..bd081fedc3a 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, unsigned char scsi3addr[], struct hpsa_scsi_dev_t *this_device) { #define OBDR_TAPE_INQ_SIZE 49 - unsigned char *inq_buff = NULL; + unsigned char *inq_buff; - inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL); + inq_buff = kzalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL); if (!inq_buff) goto bail_out; - memset(inq_buff, 0, OBDR_TAPE_INQ_SIZE); /* Do an inquiry to the device to see what it is. */ if (hpsa_scsi_do_inquiry(h, scsi3addr, 0, inq_buff, (unsigned char) OBDR_TAPE_INQ_SIZE) != 0) { |