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

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

[SCSI] hpsa: fix use of uninitialized variable in hpsa_add_msa2xxx_enclosure_device()



Thanks to Scott Teel for noticing this.

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 94a13649
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -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. */
	if (lun == 0) /* if lun is 0, then obviously we have a lun 0. */
		return 0;
		return 0;


	memset(scsi3addr, 0, 8);
	scsi3addr[3] = target;
	if (is_hba_lunid(scsi3addr))
	if (is_hba_lunid(scsi3addr))
		return 0; /* Don't add the RAID controller here. */
		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;
		return 0;
	}
	}


	memset(scsi3addr, 0, 8);
	scsi3addr[3] = target;
	if (hpsa_update_device_info(h, scsi3addr, this_device))
	if (hpsa_update_device_info(h, scsi3addr, this_device))
		return 0;
		return 0;
	(*nmsa2xxx_enclosures)++;
	(*nmsa2xxx_enclosures)++;