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

Commit bf2a1928 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by James Bottomley
Browse files

[SCSI] aic94xx: Match request_firmware with release_firmware 



The vmalloc() blob holding the sequencer firmware wasn't being released at
module unload time, which resulted in a memory leak.

Signed-off-by: default avatarAlexis Bruemmer <alexisb@us.ibm.com>
Acked-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 3cd041fb

drivers/scsi/aic94xx/aic94xx_init.c

+1 −0
Original line number Diff line number Diff line
@@ -886,6 +886,7 @@ static void __exit aic94xx_exit(void) 
	asd_remove_driver_attrs(&aic94xx_pci_driver.driver);

	pci_unregister_driver(&aic94xx_pci_driver);

	sas_release_transport(aic94xx_transport_template);

	asd_release_firmware();

	asd_destroy_global_caches();

	asd_printk("%s version %s unloaded\n", ASD_DRIVER_DESCRIPTION,

		   ASD_DRIVER_VERSION);

drivers/scsi/aic94xx/aic94xx_seq.c

+7 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,13 @@ static int asd_seq_start_lseq(struct asd_ha_struct *asd_ha, int lseq) 
	return asd_seq_unpause_lseq(asd_ha, lseq);

}



int asd_release_firmware(void)

{

	if (sequencer_fw)

		release_firmware(sequencer_fw);

	return 0;

}



static int asd_request_firmware(struct asd_ha_struct *asd_ha)

{

	int err, i;

drivers/scsi/aic94xx/aic94xx_seq.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ int asd_pause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask); 
int asd_unpause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask);

int asd_init_seqs(struct asd_ha_struct *asd_ha);

int asd_start_seqs(struct asd_ha_struct *asd_ha);

int asd_release_firmware(void);



void asd_update_port_links(struct asd_ha_struct *asd_ha, struct asd_phy *phy);

#endif