linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface
@ 2020-05-20 13:08 Dinghao Liu
  2020-05-20 18:50 ` Tony Lindgren
  2020-05-29 17:35 ` Kalle Valo
  0 siblings, 2 replies; 3+ messages in thread
From: Dinghao Liu @ 2020-05-20 13:08 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Kalle Valo, David S. Miller, Jakub Kicinski, Thomas Gleixner,
	Johannes Berg, Fuqian Huang, Tony Lindgren, Jason A. Donenfeld,
	Emmanuel Grumbach, Maital Hahn, linux-wireless, netdev,
	linux-kernel

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(-)

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);
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface
  2020-05-20 13:08 [PATCH] wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface Dinghao Liu
@ 2020-05-20 18:50 ` Tony Lindgren
  2020-05-29 17:35 ` Kalle Valo
  1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2020-05-20 18:50 UTC (permalink / raw)
  To: Dinghao Liu
  Cc: kjlu, Kalle Valo, David S. Miller, Jakub Kicinski,
	Thomas Gleixner, Johannes Berg, Fuqian Huang, Jason A. Donenfeld,
	Emmanuel Grumbach, Maital Hahn, linux-wireless, netdev,
	linux-kernel

* 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>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface
  2020-05-20 13:08 [PATCH] wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface Dinghao Liu
  2020-05-20 18:50 ` Tony Lindgren
@ 2020-05-29 17:35 ` Kalle Valo
  1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2020-05-29 17:35 UTC (permalink / raw)
  To: Dinghao Liu
  Cc: dinghao.liu, kjlu, David S. Miller, Jakub Kicinski,
	Thomas Gleixner, Johannes Berg, Fuqian Huang, Tony Lindgren,
	Jason A. Donenfeld, Emmanuel Grumbach, Maital Hahn,
	linux-wireless, netdev, linux-kernel

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

-- 
https://patchwork.kernel.org/patch/11560399/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-05-29 17:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 13:08 [PATCH] wlcore: fix runtime pm imbalance in __wl1271_op_remove_interface Dinghao Liu
2020-05-20 18:50 ` Tony Lindgren
2020-05-29 17:35 ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).