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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73CD1C25B0C for ; Thu, 11 Aug 2022 16:30:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237961AbiHKQaQ (ORCPT ); Thu, 11 Aug 2022 12:30:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238003AbiHKQ3e (ORCPT ); Thu, 11 Aug 2022 12:29:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF274A0269; Thu, 11 Aug 2022 09:09:06 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 4D27F61422; Thu, 11 Aug 2022 16:09:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFDB0C433C1; Thu, 11 Aug 2022 16:09:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660234145; bh=/nVgTw4cV65GjYUCvX13kMkOaCR8tdqKAY/ekcqBCZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZoY3b3F9cLZjgK1Y4ruLd32Vn4E5RaSTcIblml3yA26Y0/UEbiLIziu1u+/OrGqzB 3rTvn0vo2NZB4iBFpqAJfsBZXW7RGuZ2riwMMKEXZ52znuhlj+mTlFa6vsjBWCwY+J kJEqvDqU+j7QQJVqwUowYlVhKyn8NgxcXWjXCQU9iPeIA8K/nLT7O+Px9tMqxlEZcB 1KOTYMGYY7a7S4HhCckefEy+Fq1zr/hLxnpgMZKyc6Z2R4QfwELpeGhugBEJUNGlbX B3sjA7ero/eOrGF73A0tarcSqe3WUJOPFQ6tUocz4On6xaRslEo0M7t35ykPTFaomC UQCnvHG+DaLEA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuan Can , Hulk Robot , Herbert Xu , Sasha Levin , gilad@benyossef.com, davem@davemloft.net, linux-crypto@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 17/25] crypto: ccree - Add missing clk_disable_unprepare() in cc_pm_resume() Date: Thu, 11 Aug 2022 12:08:12 -0400 Message-Id: <20220811160826.1541971-17-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811160826.1541971-1-sashal@kernel.org> References: <20220811160826.1541971-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org From: Yuan Can [ Upstream commit 30fb034361ff1b9bfc569b2d8d66b544ea3eb18f ] Add clk_disable_unprepare() on error path in cc_pm_resume(). Reported-by: Hulk Robot Signed-off-by: Yuan Can Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/ccree/cc_pm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c index 452bd77a9ba0..96ad33507e60 100644 --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -45,6 +45,7 @@ int cc_pm_resume(struct device *dev) /* wait for Crytpcell reset completion */ if (!cc_wait_for_reset_completion(drvdata)) { dev_err(dev, "Cryptocell reset not completed"); + clk_disable_unprepare(drvdata->clk); return -EBUSY; } @@ -52,6 +53,7 @@ int cc_pm_resume(struct device *dev) rc = init_cc_regs(drvdata, false); if (rc) { dev_err(dev, "init_cc_regs (%x)\n", rc); + clk_disable_unprepare(drvdata->clk); return rc; } /* check if tee fips error occurred during power down */ -- 2.35.1