The following commit has been merged in the linux branch: commit 2cfa948c9ea8681e831743a3bb61157f590fa8d8 Author: Stephen M. Cameron scameron@beardog.cce.hp.com Date: Tue Oct 13 09:18:22 2009 +0200

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

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index fb5be2d..52f53c1 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -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;