Commit be7df63d authored Apr 03, 2019 by Douglas Anderson Committed by Greg Kroah-Hartman May 08, 2019

mwifiex: Make resume actually do something useful again on SDIO cards



commit b82d6c1f8f8288f744a9dcc16cd3085d535decca upstream.

The commit fc3a2fca ("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: fc3a2fca ("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>

parent 81a7534f

drivers/net/wireless/marvell/mwifiex/sdio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;