From 2c79c1c8fc19cb926eb73b598541b9d241442115 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Thu, 27 May 2010 15:13:22 -0500 Subject: [PATCH] --- yaml --- r: 204057 b: refs/heads/master c: 204892e9717790cd17689aaebf2790a477492734 h: refs/heads/master i: 204055: 41b21cc2218c0dcd97cc9ada2f06e753f45738c0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b0bdaf82a270..841f633e9a4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77c4495c17d7508bdef1cfd2c3c933ff5379908b +refs/heads/master: 204892e9717790cd17689aaebf2790a477492734 diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index cb0cc0993b9c..4983f3452dc4 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -3379,7 +3379,10 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h) if (err) goto err_out_free_res; h->vaddr = remap_pci_mem(h->paddr, 0x250); - + if (!h->vaddr) { + err = -ENOMEM; + goto err_out_free_res; + } err = hpsa_wait_for_board_ready(h); if (err) goto err_out_free_res; @@ -3466,6 +3469,12 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h) return 0; err_out_free_res: + if (h->transtable) + iounmap(h->transtable); + if (h->cfgtable) + iounmap(h->cfgtable); + if (h->vaddr) + iounmap(h->vaddr); /* * Deliberately omit pci_disable_device(): it does something nasty to * Smart Array controllers that pci_enable_device does not undo @@ -3684,6 +3693,8 @@ static void __devexit hpsa_remove_one(struct pci_dev *pdev) hpsa_unregister_scsi(h); /* unhook from SCSI subsystem */ hpsa_shutdown(pdev); iounmap(h->vaddr); + iounmap(h->transtable); + iounmap(h->cfgtable); hpsa_free_sg_chain_blocks(h); pci_free_consistent(h->pdev, h->nr_cmds * sizeof(struct CommandList),