Commit 6e8e8088 authored by Joe Handzik's avatar Joe Handzik Committed by Christoph Hellwig
Browse files

hpsa: fix memory leak in hpsa_hba_mode_enabled 



And while we're at it fix a magic number

Signed-off-by: default avatarJoe Handzik <joseph.t.handzik@hp.com>
Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3b7a45e5

drivers/scsi/hpsa.c

+6 −1
Original line number Diff line number Diff line
@@ -2977,6 +2977,7 @@ u8 *figure_lunaddrbytes(struct ctlr_info *h, int raid_ctlr_position, int i, 
static int hpsa_hba_mode_enabled(struct ctlr_info *h)

{

	int rc;

	int hba_mode_enabled;

	struct bmic_controller_parameters *ctlr_params;

	ctlr_params = kzalloc(sizeof(struct bmic_controller_parameters),

		GFP_KERNEL);
@@ -2989,7 +2990,11 @@ static int hpsa_hba_mode_enabled(struct ctlr_info *h) 
		kfree(ctlr_params);

		return 0;

	}

	return ctlr_params->nvram_flags & (1 << 3) ? 1 : 0;



	hba_mode_enabled =

		((ctlr_params->nvram_flags & HBA_MODE_ENABLED_FLAG) != 0);

	kfree(ctlr_params);

	return hba_mode_enabled;

}



static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)

drivers/scsi/hpsa.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct bmic_controller_parameters { 
	u8   automatic_drive_slamming;

	u8   reserved1;

	u8   nvram_flags;

#define HBA_MODE_ENABLED_FLAG (1 << 3)

	u8   cache_nvram_flags;

	u8   drive_config_flags;

	u16  reserved2;