From 5b31d5c7460b46a038621af41ada0968641adcfe Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Mon, 19 Jul 2010 13:45:26 -0500 Subject: [PATCH] --- yaml --- r: 208299 b: refs/heads/master c: da5503217d7421dbf04a0557d16cae6d5fc0960e h: refs/heads/master i: 208297: 6a21bef7a441a577abfcec519e482a6ffb3ea6d3 208295: 62d6728efbf7458523a5bc664ede04344db83af8 v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b2a53837d32a..2c6a24642c10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4809d0988f10e305511d1a3e223880fa4b21f90e +refs/heads/master: da5503217d7421dbf04a0557d16cae6d5fc0960e diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index c297d31d0c97..b70247110608 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/drivers/block/cciss.c @@ -4114,6 +4114,10 @@ static int __devinit cciss_pci_init(ctlr_info_t *c) if (err) goto err_out_free_res; c->vaddr = remap_pci_mem(c->paddr, 0x250); + if (!c->vaddr) { + err = -ENOMEM; + goto err_out_free_res; + } err = cciss_wait_for_board_ready(c); if (err) goto err_out_free_res; @@ -4198,6 +4202,12 @@ static int __devinit cciss_pci_init(ctlr_info_t *c) * Deliberately omit pci_disable_device(): it does something nasty to * Smart Array controllers that pci_enable_device does not undo */ + if (c->transtable) + iounmap(c->transtable); + if (c->cfgtable) + iounmap(c->cfgtable); + if (c->vaddr) + iounmap(c->vaddr); pci_release_regions(c->pdev); return err; } @@ -4745,6 +4755,8 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev) pci_disable_msi(hba[i]->pdev); #endif /* CONFIG_PCI_MSI */ + iounmap(hba[i]->transtable); + iounmap(hba[i]->cfgtable); iounmap(hba[i]->vaddr); pci_free_consistent(hba[i]->pdev, hba[i]->nr_cmds * sizeof(CommandList_struct),