From 1a9b226450b1ce658329932409886c394a929f6e Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 16 Jul 2008 20:33:44 +0200
Subject: [PATCH] --- yaml --- r: 102119 b: refs/heads/master c:
 ce30e4015954e281f682aa8d158a47885d8e1262 h: refs/heads/master i:   102117:
 c66f29c81acb2e7c1ba284ad4b5b444f67c8b505   102115:
 131820618eccc0f9133698fbf4bc8070a097e614   102111:
 48cac27d1ce66a65492018eef3c3da027e5ed418 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/ide/pci/sgiioc4.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a475c530b263..b3a983a97749 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb8ea0929c9cb899d61c4e155aace0b34d8cffe3
+refs/heads/master: ce30e4015954e281f682aa8d158a47885d8e1262
diff --git a/trunk/drivers/ide/pci/sgiioc4.c b/trunk/drivers/ide/pci/sgiioc4.c
index be73acb2080d..c79ff5b41088 100644
--- a/trunk/drivers/ide/pci/sgiioc4.c
+++ b/trunk/drivers/ide/pci/sgiioc4.c
@@ -588,10 +588,6 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
 	hw_regs_t hw;
 	struct ide_port_info d = sgiioc4_port_info;
 
-	hwif = ide_find_port_slot(&d);
-	if (hwif == NULL)
-		return -ENOMEM;
-
 	/*  Get the CmdBlk and CtrlBlk Base Registers */
 	bar0 = pci_resource_start(dev, 0);
 	virt_base = ioremap(bar0, pci_resource_len(dev, 0));
@@ -621,6 +617,11 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
 	hw.irq = dev->irq;
 	hw.chipset = ide_pci;
 	hw.dev = &dev->dev;
+
+	hwif = ide_find_port_slot(&d);
+	if (hwif == NULL)
+		goto err;
+
 	ide_init_port_hw(hwif, &hw);
 
 	/* The IOC4 uses MMIO rather than Port IO. */
@@ -637,6 +638,10 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
 		return -EIO;
 
 	return 0;
+err:
+	release_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE);
+	iounmap(virt_base);
+	return -ENOMEM;
 }
 
 static unsigned int __devinit