4 files changed, 22 insertions, 6 deletions

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index f8db6e342cbb..3bcb7dc32995 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -310,9 +310,10 @@ static int __init at91_cf_probe(struct platform_device *pdev)
         return 0;
 
 fail2:
-        iounmap((void __iomem *) cf->socket.io_offset);
         release_mem_region(io->start, io->end + 1 - io->start);
 fail1:
+        if (cf->socket.io_offset)
+                iounmap((void __iomem *) cf->socket.io_offset);
         if (board->irq_pin)
                 free_irq(board->irq_pin, cf);
 fail0a:
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c
index 5387de6216fb..551bde5d9430 100644
--- a/drivers/pcmcia/au1000_generic.c
+++ b/drivers/pcmcia/au1000_generic.c
@@ -449,6 +449,16 @@ out_err:
                 del_timer_sync(&skt->poll_timer);
                 pcmcia_unregister_socket(&skt->socket);
                 flush_scheduled_work();
+                if (i == 0) {
+                        iounmap(skt->virt_io + (u32)mips_io_port_base);
+                        skt->virt_io = NULL;
+                }
+#ifndef CONFIG_MIPS_XXS1500
+                else {
+                        iounmap(skt->virt_io + (u32)mips_io_port_base);
+                        skt->virt_io = NULL;
+                }
+#endif
                 ops->hw_shutdown(skt);
 
         }
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index e070a2896769..3b72be880401 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -427,7 +427,7 @@ static int voltage_set(int slot, int vcc, int vpp)
                         reg |= BCSR1_PCCVCC1;
                         break;
                 default:
-                        return 1;
+                        goto out_unmap;
         }
 
         switch(vpp) {
@@ -438,15 +438,15 @@ static int voltage_set(int slot, int vcc, int vpp)
                         if(vcc == vpp)
                                 reg |= BCSR1_PCCVPP1;
                         else
-                                return 1;
+                                goto out_unmap;
                         break;
                 case 120:
                         if ((vcc == 33) || (vcc == 50))
                                 reg |= BCSR1_PCCVPP0;
                         else
-                                return 1;
+                                goto out_unmap;
                 default:
-                        return 1;
+                        goto out_unmap;
         }
 
         /* first, turn off all power */
@@ -457,6 +457,10 @@ static int voltage_set(int slot, int vcc, int vpp)
 
         iounmap(bcsr_io);
         return 0;
+
+out_unmap:
+        iounmap(bcsr_io);
+        return 1;
 }
 
 #define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V
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);