From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4625DC433DF for ; Tue, 9 Jun 2020 00:14:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23F2B20884 for ; Tue, 9 Jun 2020 00:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591661660; bh=VTDinPnBrTtWYq9r2jdfYIPmKUtkIW3BFWKhAo5czcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QlMaybG3axWu6pktd14DAmg64RMc4DHrG6ZDonzOCqMVxIjYjQdMK4E7Dkqln/2Xn MsQVhFv08T736r/3n/8P1MbUlhfTmf8xKO7T16geUtyhy59RkkOWWa+C4484tWUSaB 17LPBQRL6DGyjlocHNUbTXfXuXE/uSmE1QjiE5qA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730765AbgFHXTQ (ORCPT ); Mon, 8 Jun 2020 19:19:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:36694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728622AbgFHXPg (ORCPT ); Mon, 8 Jun 2020 19:15:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 927EA2068D; Mon, 8 Jun 2020 23:15:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658136; bh=VTDinPnBrTtWYq9r2jdfYIPmKUtkIW3BFWKhAo5czcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aVcZRaokaH4XiXkR6gIRcOeyV4iiXskc6LDfjWcRgBghFemcnwgOzcmWaXyP1XFMa hdJjAqhgStJ0RKry+IOdkgweXVwYsyFf7XmF+D3zwjxGASaDdq7MHQFTz4vuR4eWjR t6I69BPyk09evXCC5ruIV7T1yKLza9zJLu4WtCeo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= , Greg Kroah-Hartman , devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 5.6 170/606] staging: wfx: unlock on error path Date: Mon, 8 Jun 2020 19:04:55 -0400 Message-Id: <20200608231211.3363633-170-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter commit f0b9d875faa4499afe3381404c3795e9da84bc00 upstream. We need to release the tx_lock on the error path before returning. Fixes: d1c015b4ef6f ("staging: wfx: rewrite wfx_hw_scan()") Signed-off-by: Dan Carpenter Cc: stable Reviewed-by: Jérôme Pouiller Link: https://lore.kernel.org/r/20200512083656.GA251760@mwanda Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wfx/scan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 6e1e50048651..9aa14331affd 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -57,8 +57,10 @@ static int send_scan_req(struct wfx_vif *wvif, wvif->scan_abort = false; reinit_completion(&wvif->scan_complete); timeout = hif_scan(wvif, req, start_idx, i - start_idx); - if (timeout < 0) + if (timeout < 0) { + wfx_tx_unlock(wvif->wdev); return timeout; + } ret = wait_for_completion_timeout(&wvif->scan_complete, timeout); if (req->channels[start_idx]->max_power != wvif->vif->bss_conf.txpower) hif_set_output_power(wvif, wvif->vif->bss_conf.txpower); -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89C20C433E1 for ; Mon, 8 Jun 2020 23:15:41 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6000420760 for ; Mon, 8 Jun 2020 23:15:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="aVcZRaok" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6000420760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DB386884BB; Mon, 8 Jun 2020 23:15:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J7CXc9QB0yD5; Mon, 8 Jun 2020 23:15:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CBB7388419; Mon, 8 Jun 2020 23:15:38 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C63A21BF381 for ; Mon, 8 Jun 2020 23:15:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C3557877B3 for ; Mon, 8 Jun 2020 23:15:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id luyS28EOPUVk for ; Mon, 8 Jun 2020 23:15:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by whitealder.osuosl.org (Postfix) with ESMTPS id 65EAC81AE4 for ; Mon, 8 Jun 2020 23:15:36 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 927EA2068D; Mon, 8 Jun 2020 23:15:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658136; bh=VTDinPnBrTtWYq9r2jdfYIPmKUtkIW3BFWKhAo5czcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aVcZRaokaH4XiXkR6gIRcOeyV4iiXskc6LDfjWcRgBghFemcnwgOzcmWaXyP1XFMa hdJjAqhgStJ0RKry+IOdkgweXVwYsyFf7XmF+D3zwjxGASaDdq7MHQFTz4vuR4eWjR t6I69BPyk09evXCC5ruIV7T1yKLza9zJLu4WtCeo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 170/606] staging: wfx: unlock on error path Date: Mon, 8 Jun 2020 19:04:55 -0400 Message-Id: <20200608231211.3363633-170-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, Greg Kroah-Hartman , Dan Carpenter Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" RnJvbTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKY29tbWl0IGYw YjlkODc1ZmFhNDQ5OWFmZTMzODE0MDRjMzc5NWU5ZGE4NGJjMDAgdXBzdHJlYW0uCgpXZSBuZWVk IHRvIHJlbGVhc2UgdGhlIHR4X2xvY2sgb24gdGhlIGVycm9yIHBhdGggYmVmb3JlIHJldHVybmlu Zy4KCkZpeGVzOiBkMWMwMTViNGVmNmYgKCJzdGFnaW5nOiB3Zng6IHJld3JpdGUgd2Z4X2h3X3Nj YW4oKSIpClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xl LmNvbT4KQ2M6IHN0YWJsZSA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4KUmV2aWV3ZWQtYnk6IErD qXLDtG1lIFBvdWlsbGVyIDxqZXJvbWUucG91aWxsZXJAc2lsYWJzLmNvbT4KTGluazogaHR0cHM6 Ly9sb3JlLmtlcm5lbC5vcmcvci8yMDIwMDUxMjA4MzY1Ni5HQTI1MTc2MEBtd2FuZGEKU2lnbmVk LW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4K LS0tCiBkcml2ZXJzL3N0YWdpbmcvd2Z4L3NjYW4uYyB8IDQgKysrLQogMSBmaWxlIGNoYW5nZWQs IDMgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3Rh Z2luZy93Zngvc2Nhbi5jIGIvZHJpdmVycy9zdGFnaW5nL3dmeC9zY2FuLmMKaW5kZXggNmUxZTUw MDQ4NjUxLi45YWExNDMzMWFmZmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy93Zngvc2Nh bi5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy93Zngvc2Nhbi5jCkBAIC01Nyw4ICs1NywxMCBAQCBz dGF0aWMgaW50IHNlbmRfc2Nhbl9yZXEoc3RydWN0IHdmeF92aWYgKnd2aWYsCiAJd3ZpZi0+c2Nh bl9hYm9ydCA9IGZhbHNlOwogCXJlaW5pdF9jb21wbGV0aW9uKCZ3dmlmLT5zY2FuX2NvbXBsZXRl KTsKIAl0aW1lb3V0ID0gaGlmX3NjYW4od3ZpZiwgcmVxLCBzdGFydF9pZHgsIGkgLSBzdGFydF9p ZHgpOwotCWlmICh0aW1lb3V0IDwgMCkKKwlpZiAodGltZW91dCA8IDApIHsKKwkJd2Z4X3R4X3Vu bG9jayh3dmlmLT53ZGV2KTsKIAkJcmV0dXJuIHRpbWVvdXQ7CisJfQogCXJldCA9IHdhaXRfZm9y X2NvbXBsZXRpb25fdGltZW91dCgmd3ZpZi0+c2Nhbl9jb21wbGV0ZSwgdGltZW91dCk7CiAJaWYg KHJlcS0+Y2hhbm5lbHNbc3RhcnRfaWR4XS0+bWF4X3Bvd2VyICE9IHd2aWYtPnZpZi0+YnNzX2Nv bmYudHhwb3dlcikKIAkJaGlmX3NldF9vdXRwdXRfcG93ZXIod3ZpZiwgd3ZpZi0+dmlmLT5ic3Nf Y29uZi50eHBvd2VyKTsKLS0gCjIuMjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZGV2ZWwgbWFpbGluZyBsaXN0CmRldmVsQGxpbnV4ZHJpdmVycHJv amVjdC5vcmcKaHR0cDovL2RyaXZlcmRldi5saW51eGRyaXZlcnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8vZHJpdmVyZGV2LWRldmVsCg==