From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-wireless@vger.kernel.org, akarwar@marvell.com
Cc: briannorris@google.com, Jeffy Chen <jeffy.chen@rock-chips.com>,
Xinming Hu <huxm@marvell.com>, Kalle Valo <kvalo@codeaurora.org>,
Ganapathi Bhat <gbhat@marvell.com>,
Amitkumar Karwar <amitkarwar@gmail.com>,
linux-kernel@vger.kernel.org,
Nishant Sarmukadam <nishants@marvell.com>,
netdev@vger.kernel.org
Subject: [PATCH] mwifiex: uninit wakeup info when failed to add card
Date: Mon, 3 Jul 2017 15:54:30 +0800 [thread overview]
Message-ID: <1499068470-8022-1-git-send-email-jeffy.chen@rock-chips.com> (raw)
We inited wakeup info at the beginning of mwifiex_add_card, so we need
to uninit it in the error handling.
It's much the same as what we did in:
36908c4 mwifiex: uninit wakeup info when removing device
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/net/wireless/marvell/mwifiex/main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index f2600b8..17d2cbe 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -1655,6 +1655,8 @@ mwifiex_add_card(void *card, struct completion *fw_done,
mwifiex_shutdown_drv(adapter);
}
err_kmalloc:
+ if (adapter->irq_wakeup >= 0)
+ device_init_wakeup(adapter->dev, false);
mwifiex_free_adapter(adapter);
err_init_sw:
--
2.1.4
next reply other threads:[~2017-07-03 7:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 7:54 Jeffy Chen [this message]
2017-07-05 18:08 ` [PATCH] mwifiex: uninit wakeup info when failed to add card Brian Norris
2017-07-06 8:47 ` jeffy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499068470-8022-1-git-send-email-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=akarwar@marvell.com \
--cc=amitkarwar@gmail.com \
--cc=briannorris@google.com \
--cc=gbhat@marvell.com \
--cc=huxm@marvell.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nishants@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).