On Tue, Sep 07, 2010 at 04:24:21AM +0300, Ohad Ben-Cohen wrote:
> Do not maintain a persistent sdio_claim_host state. Instead,
> claim host before doing IO and release host soon after.
>
> This fixes several mmc deadlock scenarios, e.g. during
> suspend/resume.
>
> Signed-off-by: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
<snip>
> @@ -160,13 +189,11 @@ static void wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
> * keep host claimed while wlan is in use to keep wl1271
> * alive.
> */
> - if (enable) {
> - sdio_claim_host(func);
> - sdio_enable_func(func);
> - } else {
> - sdio_disable_func(func);
> - sdio_release_host(func);
> - }
> + if (enable)
> + return wl1271_sdio_power_on(wl);
> + else
> + return wl1271_sdio_power_off(wl);
> +
> }
Please don't add new warnings...
drivers/net/wireless/wl12xx/wl1271_sdio.c: In function ‘wl1271_sdio_set_power’:
drivers/net/wireless/wl12xx/wl1271_sdio.c:193: warning: ‘return’ with a value, in function returning void
drivers/net/wireless/wl12xx/wl1271_sdio.c:195: warning: ‘return’ with a value, in function returning void
drivers/net/wireless/wl12xx/wl1271_sdio.c:186: warning: unused variable ‘func’
I'll fix these in a separate patch.
John
--
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
