mirror of
https://github.com/torvalds/linux
synced 2024-09-22 03:55:39 +00:00
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 <scameron@beardog.cce.hp.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
c7ebf0657b
commit
2cfa948c9e
|
@ -4254,7 +4254,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
|
||||||
mutex_init(&hba[i]->busy_shutting_down);
|
mutex_init(&hba[i]->busy_shutting_down);
|
||||||
|
|
||||||
if (cciss_pci_init(hba[i], pdev) != 0)
|
if (cciss_pci_init(hba[i], pdev) != 0)
|
||||||
goto clean0;
|
goto clean_no_release_regions;
|
||||||
|
|
||||||
sprintf(hba[i]->devname, "cciss%d", i);
|
sprintf(hba[i]->devname, "cciss%d", i);
|
||||||
hba[i]->ctlr = i;
|
hba[i]->ctlr = i;
|
||||||
|
@ -4391,13 +4391,14 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
|
||||||
clean1:
|
clean1:
|
||||||
cciss_destroy_hba_sysfs_entry(hba[i]);
|
cciss_destroy_hba_sysfs_entry(hba[i]);
|
||||||
clean0:
|
clean0:
|
||||||
|
pci_release_regions(pdev);
|
||||||
|
clean_no_release_regions:
|
||||||
hba[i]->busy_initializing = 0;
|
hba[i]->busy_initializing = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Deliberately omit pci_disable_device(): it does something nasty to
|
* Deliberately omit pci_disable_device(): it does something nasty to
|
||||||
* Smart Array controllers that pci_enable_device does not undo
|
* Smart Array controllers that pci_enable_device does not undo
|
||||||
*/
|
*/
|
||||||
pci_release_regions(pdev);
|
|
||||||
pci_set_drvdata(pdev, NULL);
|
pci_set_drvdata(pdev, NULL);
|
||||||
free_hba(i);
|
free_hba(i);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in a new issue