diff --git a/[refs] b/[refs]
index 09c12f4388b3..9445a4d56d45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36d618be131547adc51c464a3a0a9f72f2449a2d
+refs/heads/master: 6cf4442feba5af93a09cadfc5a6512a971f7825d
diff --git a/trunk/drivers/pcmcia/pxa2xx_palmtc.c b/trunk/drivers/pcmcia/pxa2xx_palmtc.c
index 2c295078032a..3a8993ed5621 100644
--- a/trunk/drivers/pcmcia/pxa2xx_palmtc.c
+++ b/trunk/drivers/pcmcia/pxa2xx_palmtc.c
@@ -156,7 +156,7 @@ static int palmtc_wifi_powerup(void)
 static int palmtc_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
 					const socket_state_t *state)
 {
-	int ret;
+	int ret = 1;
 
 	if (state->Vcc == 0)
 		ret = palmtc_wifi_powerdown();