From: Kalle Valo <kvalo@codeaurora.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Amitkumar Karwar <amitkarwar@gmail.com>,
Xinming Hu <huxm@marvell.com>,
Nishant Sarmukadam <nishants@marvell.com>,
Ganapathi Bhat <gbhat@marvell.com>,
linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: mwifiex: usb: unlock on error in mwifiex_usb_tx_aggr_tmo()
Date: Fri, 28 Jul 2017 14:51:35 +0000 (UTC) [thread overview]
Message-ID: <20170728145135.D98EC60915@smtp.codeaurora.org> (raw)
In-Reply-To: <20170710072115.2y4ukbl7x4rk4bac@mwanda>
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> We need to unlock if mwifiex_usb_prepare_tx_aggr_skb() fails.
>
> Fixes: a2ca85ad721d ("mwifiex: usb: add timer to flush aggregation packets")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
> index cb1753e43ef4..880ef1cb4088 100644
> --- a/drivers/net/wireless/marvell/mwifiex/usb.c
> +++ b/drivers/net/wireless/marvell/mwifiex/usb.c
> @@ -1112,7 +1112,7 @@ static void mwifiex_usb_tx_aggr_tmo(unsigned long context)
> if (err) {
> mwifiex_dbg(adapter, ERROR,
> "prepare tx aggr skb failed, err=%d\n", err);
> - return;
> + goto unlock;
> }
>
> if (atomic_read(&port->tx_data_urb_pending) >=
> @@ -1133,6 +1133,7 @@ static void mwifiex_usb_tx_aggr_tmo(unsigned long context)
> done:
> if (err == -1)
> mwifiex_write_data_complete(adapter, skb_send, 0, -1);
> +unlock:
> spin_unlock_irqrestore(&port->tx_aggr_lock, flags);
> }
Patch applied to wireless-drivers-next.git, thanks.
fe0c94be77a0 mwifiex: usb: unlock on error in mwifiex_usb_tx_aggr_tmo()
--
https://patchwork.kernel.org/patch/9832397/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
prev parent reply other threads:[~2017-07-28 14:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-10 7:21 [PATCH] mwifiex: usb: unlock on error in mwifiex_usb_tx_aggr_tmo() Dan Carpenter
2017-07-17 3:12 ` Xinming Hu
2017-07-28 14:51 ` Kalle Valo [this message]
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=20170728145135.D98EC60915@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=amitkarwar@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=gbhat@marvell.com \
--cc=huxm@marvell.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-wireless@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).