diff --git a/[refs] b/[refs]
index c37a6f191fd8..7f868680c67d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2c1e3dad516618cb0fbfb1a62c36d0b0744573a
+refs/heads/master: 78381c41776572cb642a485219c5d7651f198fbd
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
index b3c3158551c8..b5d9565f659f 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -159,40 +159,34 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
 		wl1271_error("sdio write failed (%d)", ret);
 }
 
-static int wl1271_sdio_power_on(struct wl1271 *wl)
+static void wl1271_sdio_power_on(struct wl1271 *wl)
 {
 	struct sdio_func *func = wl_to_func(wl);
 
 	sdio_claim_host(func);
 	sdio_enable_func(func);
 	sdio_release_host(func);
-
-	return 0;
 }
 
-static int wl1271_sdio_power_off(struct wl1271 *wl)
+static void wl1271_sdio_power_off(struct wl1271 *wl)
 {
 	struct sdio_func *func = wl_to_func(wl);
 
 	sdio_claim_host(func);
 	sdio_disable_func(func);
 	sdio_release_host(func);
-
-	return 0;
 }
 
 static void wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
 {
-	struct sdio_func *func = wl_to_func(wl);
-
 	/* Let the SDIO stack handle wlan_enable control, so we
 	 * keep host claimed while wlan is in use to keep wl1271
 	 * alive.
 	 */
 	if (enable)
-		return wl1271_sdio_power_on(wl);
+		wl1271_sdio_power_on(wl);
 	else
-		return wl1271_sdio_power_off(wl);
+		wl1271_sdio_power_off(wl);
 
 }