diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-01-07 10:55:43 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-01-24 11:33:32 -0600 |
| commit | c4f8a299d04bd083643ba93e982ab910219dd1f0 (patch) | |
| tree | 136ab863eed404c861b8755dec9ec1c91c6621f5 /drivers/scsi/hpsa.c | |
| parent | 94a136495a3fbe59b960c46fba3574b1159e8489 (diff) | |
| download | op-kernel-dev-c4f8a299d04bd083643ba93e982ab910219dd1f0.zip op-kernel-dev-c4f8a299d04bd083643ba93e982ab910219dd1f0.tar.gz | |
[SCSI] hpsa: fix use of uninitialized variable in hpsa_add_msa2xxx_enclosure_device()
Thanks to Scott Teel for noticing this.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index c255f46..c6c13b0c 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -1617,6 +1617,8 @@ static int add_msa2xxx_enclosure_device(struct ctlr_info *h, if (lun == 0) /* if lun is 0, then obviously we have a lun 0. */ return 0; + memset(scsi3addr, 0, 8); + scsi3addr[3] = target; if (is_hba_lunid(scsi3addr)) return 0; /* Don't add the RAID controller here. */ @@ -1631,8 +1633,6 @@ static int add_msa2xxx_enclosure_device(struct ctlr_info *h, return 0; } - memset(scsi3addr, 0, 8); - scsi3addr[3] = target; if (hpsa_update_device_info(h, scsi3addr, this_device)) return 0; (*nmsa2xxx_enclosures)++; |
