Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index c8e838c69766..06bf7f48836e 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -309,9 +309,10 @@ static int __devinit omap_cf_probe(struct device *dev)
         return 0;
 
 fail2:
-        iounmap((void __iomem *) cf->socket.io_offset);
         release_mem_region(cf->phys_cf, SZ_8K);
 fail1:
+        if (cf->socket.io_offset)
+                iounmap((void __iomem *) cf->socket.io_offset);
         free_irq(irq, cf);
 fail0:
         kfree(cf);