diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-27 17:28:41 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-27 17:28:41 -0800 |
commit | bf8d1cd4386535004c4afe7f03d37f9864c9940e (patch) | |
tree | dd73f0691e687860ed81e612e9a8d9847ed8c152 /drivers/scsi/mpt3sas/mpt3sas_base.c | |
parent | 48a8dd171993569cb77dee0882a47abad47d2837 (diff) | |
parent | e4dc9a4c31fe10d1751c542702afc85be8a5c56a (diff) | |
download | talos-op-linux-bf8d1cd4386535004c4afe7f03d37f9864c9940e.tar.gz talos-op-linux-bf8d1cd4386535004c4afe7f03d37f9864c9940e.zip |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Four fixes and one spelling update, all in drivers: two in lpfc and
the rest in mp3sas, cxgbi and target"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: target/iblock: Fix protection error with blocks greater than 512B
scsi: libcxgbi: fix NULL pointer dereference in cxgbi_device_destroy()
scsi: lpfc: fix spelling mistakes of asynchronous
scsi: lpfc: fix build failure with DEBUGFS disabled
scsi: mpt3sas: Fix double free in attach error handling
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_base.c')
-rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_base.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 848fbec7bda6..45fd8dfb7c40 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -5248,7 +5248,6 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) &ct->chain_buffer_dma); if (!ct->chain_buffer) { ioc_err(ioc, "chain_lookup: pci_pool_alloc failed\n"); - _base_release_memory_pools(ioc); goto out; } } |