Commit 75e167c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Two small fixes, both in drivers.

  The mptsas one is really fixing an error path issue where it can leave
  the misc driver loaded even though the sas driver fails to initialize"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Fix double free of dsd_list during driver load
  scsi: mpt3sas: Fix in error path
parents 659eaa00 097c0639

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+3 −1
Original line number Diff line number Diff line
@@ -12913,8 +12913,10 @@ _mpt3sas_init(void) 
	mpt3sas_ctl_init(hbas_to_enumerate);



	error = pci_register_driver(&mpt3sas_driver);

	if (error)

	if (error) {

		mpt3sas_ctl_exit(hbas_to_enumerate);

		scsih_exit();

	}



	return error;

}

drivers/scsi/qla2xxx/qla_os.c

+1 −1
Original line number Diff line number Diff line
@@ -4953,7 +4953,7 @@ qla2x00_mem_free(struct qla_hw_data *ha) 
	ha->gid_list = NULL;

	ha->gid_list_dma = 0;



	if (!list_empty(&ha->base_qpair->dsd_list)) {

	if (ha->base_qpair && !list_empty(&ha->base_qpair->dsd_list)) {

		struct dsd_dma *dsd_ptr, *tdsd_ptr;



		/* clean up allocated prev pool */