Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6d3bc3 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley
Browse files

[SCSI] hpsa: use kzalloc not kmalloc plus memset 



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent e89c0ae7

drivers/scsi/hpsa.c

+2 −3
Original line number Diff line number Diff line
@@ -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) {