Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1322439

[PATCH v3 5/6] libertas: fix ps-mode related removal problems

Show all headers | View raw

When the device is remove e.g. because of going to suspend
 mode with powersaving enabled, lbs_remove_card tries to exit
powersaving state even when already woken up. That command is
not processed properly in that situation, since the command
processing queue is already stopped, so it waits forever
for the command being processed, so disable it.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
---
changes in v3: corrected paths
changes in v2: improved commit message, reordered: was 6/6
 drivers/net/wireless/marvell/libertas/main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/marvell/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 8079560..b35b8bc 100644
--- a/drivers/net/wireless/marvell/libertas/main.c
+++ b/drivers/net/wireless/marvell/libertas/main.c
@@ -1060,7 +1060,12 @@ void lbs_remove_card(struct lbs_private *priv)
 
 	if (priv->psmode == LBS802_11POWERMODEMAX_PSP) {
 		priv->psmode = LBS802_11POWERMODECAM;
-		lbs_set_ps_mode(priv, PS_MODE_ACTION_EXIT_PS, true);
+		/* no need to wakeup if already woken up,
+		 * on suspend, this exit ps command is not processed
+		 * the driver hangs
+		 */
+		if (priv->psstate != PS_STATE_FULL_POWER)
+			lbs_set_ps_mode(priv, PS_MODE_ACTION_EXIT_PS, true);
 	}
 
 	if (priv->is_deep_sleep) {
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/6] libertas: ieee80211 powersave mode  Andreas Kemnade <andreas@kemnade.info> - 2016-01-30 18:10 +0100
  [PATCH v3 1/6] libertas: fix pointer bugs for PS_MODE commands Andreas Kemnade <andreas@kemnade.info> - 2016-01-30 18:10 +0100
    Re: [v3,1/6] libertas: fix pointer bugs for PS_MODE commands Kalle Valo <kvalo@codeaurora.org> - 2016-02-06 13:10 +0100
  [PATCH v3 5/6] libertas: fix ps-mode related removal problems Andreas Kemnade <andreas@kemnade.info> - 2016-01-30 18:10 +0100
  [PATCH v3 2/6] libertas: check whether bus can do more than polling Andreas Kemnade <andreas@kemnade.info> - 2016-01-30 18:10 +0100

csiph-web