--- zzzz-none-000/linux-2.6.19.2/drivers/pcmcia/m8xx_pcmcia.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/pcmcia/m8xx_pcmcia.c	2007-01-11 07:38:19.000000000 +0000
@@ -427,7 +427,7 @@
 			reg |= BCSR1_PCCVCC1;
 			break;
 		default:
-			goto out_unmap;
+			return 1;
 	}
 
 	switch(vpp) {
@@ -438,15 +438,15 @@
 			if(vcc == vpp)
 				reg |= BCSR1_PCCVPP1;
 			else
-				goto out_unmap;
+				return 1;
 			break;
 		case 120:
 			if ((vcc == 33) || (vcc == 50))
 				reg |= BCSR1_PCCVPP0;
 			else
-				goto out_unmap;
+				return 1;
 		default:
-			goto out_unmap;
+			return 1;
 	}
 
 	/* first, turn off all power */
@@ -457,10 +457,6 @@
 
 	iounmap(bcsr_io);
 	return 0;
-
-out_unmap:
-	iounmap(bcsr_io);
-	return 1;
 }
 
 #define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V