From 6ede3ce53f2ba89147aa68628fad070e88984d54 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 4 Feb 2010 08:42:09 -0600
Subject: [PATCH] --- yaml --- r: 181323 b: refs/heads/master c:
 ea6d3bc3143a21ec5e1c9330555b36d67979431d h: refs/heads/master i:   181321:
 169764bc0eb12eda79d64b693f485232b7f99acf   181319:
 1cdb67a6509783cda741a069ded519770dc4bb67 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/hpsa.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 438ef7889d50..8d52fc03dd4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e89c0ae7babc3e702a9da128b3ac1eb04ed73c2c
+refs/heads/master: ea6d3bc3143a21ec5e1c9330555b36d67979431d
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index add2ed578466..bd081fedc3a7 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/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) {