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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 1EDBDC32771 for ; Fri, 24 Jan 2020 09:40:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD7D8208C4 for ; Fri, 24 Jan 2020 09:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858828; bh=g01oey4yaSdr4gHsShStOXO47xlC6uMGH7eH5eylq98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zOILd4b31e3IXraUgPO6LQVxc2rPC5svMkd1YWsm8t7Rxe+2OCdh2Uf19D7lo2JK8 Tuqu6HpWvkAh3y8U0EXImJf/hP/F3oXih+oqYcw1m4AAZxCyJ46eDNGuH/mUTTV7sA Zb8CVLjt3cHBKlth0iPyKjeOZqX6elYFH9N8b8pU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729889AbgAXJj6 (ORCPT ); Fri, 24 Jan 2020 04:39:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:37198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729693AbgAXJj6 (ORCPT ); Fri, 24 Jan 2020 04:39:58 -0500 Received: from localhost (unknown [145.15.244.15]) (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 AB1E620709; Fri, 24 Jan 2020 09:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858797; bh=g01oey4yaSdr4gHsShStOXO47xlC6uMGH7eH5eylq98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wce1qRt5piE1g86EWTrqql738Zd8DAoi44lKi+iA3s3mKkRAytF7bbmIpAevJQx5r p2BwFtfGLrmHHikt3asxUgNGPMYGfrlsw/YkWyhJ6OxK76sw0lOGfpxH1dFi12DwHq zcbVcD1eoKmpOfpkNn2K5Im9ANnixgu8RIp9o/mo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ping-Ke Shih , Yan-Hsuan Chuang , Kalle Valo Subject: [PATCH 5.4 050/102] rtw88: fix error handling when setup efuse info Date: Fri, 24 Jan 2020 10:30:51 +0100 Message-Id: <20200124092813.864213226@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092806.004582306@linuxfoundation.org> References: <20200124092806.004582306@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Ping-Ke Shih commit f4268729eb1eefe23f6746849c1b5626d9030532 upstream. Disable efuse if the efuse is enabled when we failed to setup the efuse information, otherwise the hardware will not turn off. Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver") Signed-off-by: Ping-Ke Shih Signed-off-by: Yan-Hsuan Chuang Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtw88/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1048,19 +1048,19 @@ static int rtw_chip_efuse_info_setup(str /* power on mac to read efuse */ ret = rtw_chip_efuse_enable(rtwdev); if (ret) - goto out; + goto out_unlock; ret = rtw_parse_efuse_map(rtwdev); if (ret) - goto out; + goto out_disable; ret = rtw_dump_hw_feature(rtwdev); if (ret) - goto out; + goto out_disable; ret = rtw_check_supported_rfe(rtwdev); if (ret) - goto out; + goto out_disable; if (efuse->crystal_cap == 0xff) efuse->crystal_cap = 0; @@ -1087,9 +1087,10 @@ static int rtw_chip_efuse_info_setup(str efuse->ext_pa_5g = efuse->pa_type_5g & BIT(0) ? 1 : 0; efuse->ext_lna_2g = efuse->lna_type_5g & BIT(3) ? 1 : 0; +out_disable: rtw_chip_efuse_disable(rtwdev); -out: +out_unlock: mutex_unlock(&rtwdev->mutex); return ret; }