diff mbox series

wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface

Message ID 20200520130806.14789-1-dinghao.liu@zju.edu.cn (mailing list archive)
State Accepted
Commit 53df5271f2397706be85c3892246e3e726113902
Delegated to: Kalle Valo
Headers show
Series wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface | expand

Commit Message

Dinghao Liu May 20, 2020, 1:08 p.m. UTC
When wl12xx_cmd_role_disable() returns an error code,
a pairing runtime PM usage counter decrement is needed to
keep the counter balanced.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
 drivers/net/wireless/ti/wlcore/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Tony Lindgren May 20, 2020, 6:50 p.m. UTC | #1
* Dinghao Liu <dinghao.liu@zju.edu.cn> [200520 13:09]:
> When wl12xx_cmd_role_disable() returns an error code,
> a pairing runtime PM usage counter decrement is needed to
> keep the counter balanced.

Acked-by: Tony Lindgren <tony@atomide.com>
Kalle Valo May 29, 2020, 5:35 p.m. UTC | #2
Dinghao Liu <dinghao.liu@zju.edu.cn> wrote:

> When wl12xx_cmd_role_disable() returns an error code,
> a pairing runtime PM usage counter decrement is needed to
> keep the counter balanced.
> 
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> Acked-by: Tony Lindgren <tony@atomide.com>

Patch applied to wireless-drivers-next.git, thanks.

53df5271f239 wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface
diff mbox series

Patch

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index f140f7d7f553..e6c299efbc2e 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -2698,12 +2698,16 @@  static void __wl1271_op_remove_interface(struct wl1271 *wl,
 
 		if (!wlcore_is_p2p_mgmt(wlvif)) {
 			ret = wl12xx_cmd_role_disable(wl, &wlvif->role_id);
-			if (ret < 0)
+			if (ret < 0) {
+				pm_runtime_put_noidle(wl->dev);
 				goto deinit;
+			}
 		} else {
 			ret = wl12xx_cmd_role_disable(wl, &wlvif->dev_role_id);
-			if (ret < 0)
+			if (ret < 0) {
+				pm_runtime_put_noidle(wl->dev);
 				goto deinit;
+			}
 		}
 
 		pm_runtime_mark_last_busy(wl->dev);