From patchwork Mon Oct 24 11:31:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp643337wru; Mon, 24 Oct 2022 13:41:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7tGAsWfS6a30aievtO3KVcLbXZgQ+44S+vTAmxiSfQLp5Mbyf5T4i5gkAH6RLHdZzRYkoN X-Received: by 2002:a63:1c47:0:b0:44c:2476:12ff with SMTP id c7-20020a631c47000000b0044c247612ffmr30697272pgm.50.1666644077263; Mon, 24 Oct 2022 13:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666644077; cv=none; d=google.com; s=arc-20160816; b=AijjOh2MeaOsx4GrnXxrJXYgfy9ovNT6sMPyMPVyZPfWF8mC1advx9d05ePCHuC9S0 bQ3m4OvW2TLxHJpcOxHnfJwP1m00UOOtwqHSRRlOUg6kLO4cuEqDUNiY3DsBJxM9zVEv v8/jILX4ZscDS0IOu7BXvjtZpaW0NV+RZYJsCneTBMIWkuzwjQ+bbtKVNqs4DtMgR7OI 7vTZfXWXTWPkhH6XrxESCJryKsiILv5Z88UxqQ7RRop+l51LVuFynklsrnF9fGqA4Fyh yi+uVBE/jOt/CazLCs1rQ7tku0Ov2Jm5QEpRGZgmd30zBhB+tWcdXCiWLJ+fUSd4h9zo 8qaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=b2LrdPslTpSR+a4NoDv8cr21N1Dh60AfYOqXbgR7nX8=; b=OVCDGGDI0NdCPSBtkTaKbUY65SPjSk3eNVk/tuGkE7o9jO1IPEOBSmE1+Z7xcBnGXo /5TT60OFdaFd4Fh11/nlUR6jGdKIMO+doZjUrndNaXHVF7Sp6U8fqTL3O2UtCvnTEs4+ 2c6EDMlVwqSEPEuiFwWUAontnZevMUTh6iSvYXmp6MWrvwTG7yCsm8Thst/NksW89QH8 UyWXUxtlRdUT8s8oKHGIJidAvEAQyO1sAP45o7ciA68Y4A9mTDO2sq8pGksJAqnnx8xq A67ze+dYJtWonJg+kVYdWLRxFBfGNI8H6wRZBIT6tPSYiY5dPlDzZ7X0qLBDTr80qhgF bIlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VeOXsCoP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b13-20020a170902b60d00b0018695bddc45si542917pls.193.2022.10.24.13.41.04; Mon, 24 Oct 2022 13:41:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VeOXsCoP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234756AbiJXUkh (ORCPT + 99 others); Mon, 24 Oct 2022 16:40:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234791AbiJXUjL (ORCPT ); Mon, 24 Oct 2022 16:39:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20F9A2CC98; Mon, 24 Oct 2022 11:50:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C6864B811BB; Mon, 24 Oct 2022 12:11:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C701C433C1; Mon, 24 Oct 2022 12:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613479; bh=npCRfkXpyD3oFS/RTYI4IZ26DGEUxTCME7Uv6lz4OjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VeOXsCoPVaiJmfVNVAeAlwmXsIGm6IZk48PCNHF9m95RBbpDfcqqtKXgYblTxHepf MktaIVj0Sv5LHas34Hy3tgXHr5g97CNUl+4Zl7mbUGHVWZA+M65KqonzwHu91vhbkh c7cTy+uxHfvASIo3gFYHaiTYCpP/4sm4DCupe9lY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dongliang Mu , Neil Armstrong , Vinod Koul , Sasha Levin Subject: [PATCH 5.4 151/255] phy: qualcomm: call clk_disable_unprepare in the error handling Date: Mon, 24 Oct 2022 13:31:01 +0200 Message-Id: <20221024113007.653516098@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747602979826059025?= X-GMAIL-MSGID: =?utf-8?q?1747602979826059025?= From: Dongliang Mu [ Upstream commit c3966ced8eb8dc53b6c8d7f97d32cc8a2107d83e ] Smatch reports the following error: drivers/phy/qualcomm/phy-qcom-usb-hsic.c:82 qcom_usb_hsic_phy_power_on() warn: 'uphy->cal_clk' from clk_prepare_enable() not released on lines: 58. drivers/phy/qualcomm/phy-qcom-usb-hsic.c:82 qcom_usb_hsic_phy_power_on() warn: 'uphy->cal_sleep_clk' from clk_prepare_enable() not released on lines: 58. drivers/phy/qualcomm/phy-qcom-usb-hsic.c:82 qcom_usb_hsic_phy_power_on() warn: 'uphy->phy_clk' from clk_prepare_enable() not released on lines: 58. Fix this by calling proper clk_disable_unprepare calls. Fixes: 0b56e9a7e835 ("phy: Group vendor specific phy drivers") Signed-off-by: Dongliang Mu Reviewed-by: Neil Armstrong Link: https://lore.kernel.org/r/20220914051334.69282-1-dzm91@hust.edu.cn Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/qualcomm/phy-qcom-usb-hsic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-usb-hsic.c b/drivers/phy/qualcomm/phy-qcom-usb-hsic.c index 04d18d52f700..d4741c2dbbb5 100644 --- a/drivers/phy/qualcomm/phy-qcom-usb-hsic.c +++ b/drivers/phy/qualcomm/phy-qcom-usb-hsic.c @@ -54,8 +54,10 @@ static int qcom_usb_hsic_phy_power_on(struct phy *phy) /* Configure pins for HSIC functionality */ pins_default = pinctrl_lookup_state(uphy->pctl, PINCTRL_STATE_DEFAULT); - if (IS_ERR(pins_default)) - return PTR_ERR(pins_default); + if (IS_ERR(pins_default)) { + ret = PTR_ERR(pins_default); + goto err_ulpi; + } ret = pinctrl_select_state(uphy->pctl, pins_default); if (ret)