Commit a15f1c45 authored Aug 22, 2011 by Ido Yariv Committed by John W. Linville Aug 23, 2011

wl12xx: Fix validation of pm_runtime_get_sync return value



wl1271_sdio_power_on checks if the return value of pm_runtime_get_sync
is non-zero, and if so bails out.
However, pm_runtime_get_sync can return a positive number which does not
suggest an error has occurred. This is problematic for two reasons:

1. The function will needlessly bail out without decrementing back the
   runtime PM reference counter.
2. wl1271_power_on only checks if wl1271_power_on return value is
   negative. This means that wl1271_power_on will continue even if
   wl1271_sdio_power_on bailed out. As a result, sdio transactions will
   be initiated without properly enabling the sdio function and claiming
   the host. This could even lead to a kernel panic.

Fix this by only checking that the return value of pm_runtime_get_sync
is non-negative.

Signed-off-by: Ido Yariv <ido@wizery.com>
Acked-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 80900d01

drivers/net/wireless/wl12xx/sdio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ static int wl1271_sdio_power_on(struct wl1271 *wl)
		/* If enabled, tell runtime PM not to power off the card */
		if (pm_runtime_enabled(&func->dev)) {
		ret = pm_runtime_get_sync(&func->dev);
		if (ret)
		if (ret < 0)
		goto out;
		} else {
		/* Runtime PM is disabled: power up the card manually */