diff options
| author | Douglas Anderson | 2019-04-04 06:01:06 +0200 |
|---|---|---|
| committer | Kalle Valo | 2019-04-25 13:05:14 +0200 |
| commit | b82d6c1f8f8288f744a9dcc16cd3085d535decca (patch) | |
| tree | 9920723ba38805e4099d4afd6a4bff3bbce2436d /drivers/net/wireless | |
| parent | Merge tag 'iwlwifi-for-kalle-2019-04-19' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | kernel-qcow2-linux-b82d6c1f8f8288f744a9dcc16cd3085d535decca.tar.gz kernel-qcow2-linux-b82d6c1f8f8288f744a9dcc16cd3085d535decca.tar.xz kernel-qcow2-linux-b82d6c1f8f8288f744a9dcc16cd3085d535decca.zip | |
mwifiex: Make resume actually do something useful again on SDIO cards
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>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index a85648342d15..d5a70340a945 100644 --- 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 device *dev) 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; |