tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 75e167c2 659eaa00

+4 -2
+3 -1
drivers/scsi/mpt3sas/mpt3sas_scsih.c
··· 12913 12913 mpt3sas_ctl_init(hbas_to_enumerate); 12914 12914 12915 12915 error = pci_register_driver(&mpt3sas_driver); 12916 - if (error) 12916 + if (error) { 12917 + mpt3sas_ctl_exit(hbas_to_enumerate); 12917 12918 scsih_exit(); 12919 + } 12918 12920 12919 12921 return error; 12920 12922 }
+1 -1
drivers/scsi/qla2xxx/qla_os.c
··· 4953 4953 ha->gid_list = NULL; 4954 4954 ha->gid_list_dma = 0; 4955 4955 4956 - if (!list_empty(&ha->base_qpair->dsd_list)) { 4956 + if (ha->base_qpair && !list_empty(&ha->base_qpair->dsd_list)) { 4957 4957 struct dsd_dma *dsd_ptr, *tdsd_ptr; 4958 4958 4959 4959 /* clean up allocated prev pool */