cciss: Fix multiple calls to pci_release_regions
PATCH 1/1 cciss: Fix multiple calls to pci_release_regions
Fix multiple calls to pci_release_regions. If cciss_pci_init fails, it already does any necessary call to pci_release_regions, so this does not need to be done again in cciss_init_one in that case.
Signed-off-by Stephen M. Cameron <[email protected]>
---
drivers/block/cciss.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/block/cciss.c +3 -2
@@ -4254,7 +4254,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,mutex_init (&hba[i]->busy_shutting_down);if (cciss_pci_init (hba[i], pdev) !=0 ) - goto clean0; + goto clean_no_release_regions;sprintf (hba[i]->devname,"cciss%d" , i); hba[i]->ctlr = i;
@@ -4391,13 +4391,14 @@ clean2: clean1:cciss_destroy_hba_sysfs_entry (hba[i]); clean0: +pci_release_regions (pdev); +clean_no_release_regions: hba[i]->busy_initializing =0 ;/* * Deliberately omit pci_disable_device(): it does something nasty to * Smart Array controllers that pci_enable_device does not undo */ -pci_release_regions (pdev);pci_set_drvdata (pdev,NULL );free_hba (i);return -1 ;
Jens Axboe
AppliedQuoted 4 lines · Stephen M. Cameron
Fix multiple calls to
pci_release_regions. Ifcciss_pci_initfails, it already does any necessary call topci_release_regions, so this does not need to be done again incciss_init_onein that case.
Thanks, applied
Signature · 1 line
Jens Axboe