--- zzzz-none-000/linux-2.6.19.2/drivers/pcmcia/omap_cf.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/pcmcia/omap_cf.c	2007-01-11 07:38:19.000000000 +0000
@@ -309,10 +309,9 @@
 	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);