| From b82d6c1f8f8288f744a9dcc16cd3085d535decca Mon Sep 17 00:00:00 2001 |
| From: Douglas Anderson <dianders@chromium.org> |
| Date: Wed, 3 Apr 2019 21:01:06 -0700 |
| Subject: mwifiex: Make resume actually do something useful again on SDIO cards |
| |
| From: Douglas Anderson <dianders@chromium.org> |
| |
| commit b82d6c1f8f8288f744a9dcc16cd3085d535decca upstream. |
| |
| The commit fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent |
| adapter status variables") had a fairly straightforward bug in it. It |
| contained this bit of diff: |
| |
| - if (!adapter->is_suspended) { |
| + if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) { |
| |
| As you can see the patch missed the "!" when converting to the atomic |
| bitops. This meant that the resume hasn't done anything at all since |
| that commit landed and suspend/resume for mwifiex SDIO cards has been |
| totally broken. |
| |
| After fixing this mwifiex suspend/resume appears to work again, at |
| least with the simple testing I've done. |
| |
| Fixes: fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Douglas Anderson <dianders@chromium.org> |
| Reviewed-by: Brian Norris <briannorris@chromium.org> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/marvell/mwifiex/sdio.c |
| +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c |
| @@ -181,7 +181,7 @@ static int mwifiex_sdio_resume(struct de |
| |
| adapter = card->adapter; |
| |
| - if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) { |
| + if (!test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) { |
| mwifiex_dbg(adapter, WARN, |
| "device already resumed\n"); |
| return 0; |
