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=-11.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 8E715CA90AF for ; Wed, 13 May 2020 12:04:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60C24206CC for ; Wed, 13 May 2020 12:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589371449; bh=DiV0D3Gb+mopJPqtZYLn6dDxXQ/rOD7NVFWiMcoroLc=; h=Subject:To:From:Date:List-ID:From; b=jSTOY35GHJ7HrLCFTIgqiDYO07M3h0WlxnZ7Uigz8+8CdgX52wuoa2auZ8p16JYbV WGiTvUcVe+c7A+cAIBKPUpLPAp5M5QLYTjswvTTO0xuX2VY8buTOWDUjY3Ijt1TiPy 3E3KxkSvSDWqU8ABa3AolJP1FUR4HlB0iU6B946Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730004AbgEMMEJ (ORCPT ); Wed, 13 May 2020 08:04:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:48448 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728165AbgEMMEI (ORCPT ); Wed, 13 May 2020 08:04:08 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 18DB1206E5; Wed, 13 May 2020 12:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589371448; bh=DiV0D3Gb+mopJPqtZYLn6dDxXQ/rOD7NVFWiMcoroLc=; h=Subject:To:From:Date:From; b=wD6CY/Umv+7ksaKfSimkDB+r2n4QMdvHmJVSxYLRqzKZQZywsuOHpVXFLxBvni+Ba ECl9MEQigTFF9vSUvFFYNta/SWAdvOGXV9F8oONAgMW8VBV12MhmF1k4qzCCefbKQp PS5TmLkkC2LCuPxd2kdCrp9jeugAmTFI8N/79IdM= Subject: patch "staging: wfx: unlock on error path" added to staging-linus To: dan.carpenter@oracle.com, gregkh@linuxfoundation.org, jerome.pouiller@silabs.com, stable@vger.kernel.org From: Date: Wed, 13 May 2020 14:03:58 +0200 Message-ID: <1589371438185235@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled staging: wfx: unlock on error path to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From f0b9d875faa4499afe3381404c3795e9da84bc00 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 12 May 2020 11:36:56 +0300 Subject: staging: wfx: unlock on error path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.26.2