Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181323
b: refs/heads/master
c: ea6d3bc
h: refs/heads/master
i:
  181321: 169764b
  181319: 1cdb67a
v: v3
  • Loading branch information
Stephen M. Cameron authored and James Bottomley committed Feb 17, 2010
1 parent 6cd9e0a commit 6ede3ce
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e89c0ae7babc3e702a9da128b3ac1eb04ed73c2c
refs/heads/master: ea6d3bc3143a21ec5e1c9330555b36d67979431d
5 changes: 2 additions & 3 deletions trunk/drivers/scsi/hpsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 6ede3ce

Please sign in to comment.