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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 968BBC433F5 for ; Tue, 9 Nov 2021 01:22:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F4A5610A2 for ; Tue, 9 Nov 2021 01:22:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236712AbhKIBZN (ORCPT ); Mon, 8 Nov 2021 20:25:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:46240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242240AbhKIBTg (ORCPT ); Mon, 8 Nov 2021 20:19:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B3E6361A61; Tue, 9 Nov 2021 01:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636420078; bh=DBYqDsEuPR5l4aROrVAQvL1/upaFZgZnYxxv5zi1E2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FtKuwsQZo/yRNmkYvVUn91JzWRslWnSJK6r+WzfjfIfuFP2YBhJYvXun6ZI7dTFf+ +r7dIWTG3OlbYUlVYysBaSlrdULDaILhVsr8MzCef12d2SsezYjXz1mgIjCZYPYG+a tjT10Nd+Iu5KbaTNI62/bqg69l5+UJLTGQJd2A1UtnKC4q6NQaXwDoGjhtCDhQAKWc LFYkUTpsaiWSsIgNXzYZe2YW2SGbnczMJgJonWU/QHEvq5i40Li4e/mM0bHyqNufo2 Mx0b1GatEI5CZB3EPF9XRWLGMxXxlfjehsMH0GmOyhl75zCIvW6Doo83KNB6vE31fw NiMeE8ZaWbXoA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Hulk Robot , Mark Brown , Sasha Levin , kdasu.kdev@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-spi@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 36/39] spi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe() Date: Mon, 8 Nov 2021 20:06:46 -0500 Message-Id: <20211109010649.1191041-36-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109010649.1191041-1-sashal@kernel.org> References: <20211109010649.1191041-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-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit ca9b8f56ec089d3a436050afefd17b7237301f47 ] Fix the missing clk_disable_unprepare() before return from bcm_qspi_probe() in the error handling case. Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20211018073413.2029081-1-yangyingliang@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-bcm-qspi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index 11adc2c13a74c..298b1dd463800 100644 --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c @@ -1301,7 +1301,7 @@ int bcm_qspi_probe(struct platform_device *pdev, &qspi->dev_ids[val]); if (ret < 0) { dev_err(&pdev->dev, "IRQ %s not found\n", name); - goto qspi_probe_err; + goto qspi_unprepare_err; } qspi->dev_ids[val].dev = qspi; @@ -1316,7 +1316,7 @@ int bcm_qspi_probe(struct platform_device *pdev, if (!num_ints) { dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n"); ret = -EINVAL; - goto qspi_probe_err; + goto qspi_unprepare_err; } /* @@ -1367,6 +1367,7 @@ int bcm_qspi_probe(struct platform_device *pdev, qspi_reg_err: bcm_qspi_hw_uninit(qspi); +qspi_unprepare_err: clk_disable_unprepare(qspi->clk); qspi_probe_err: kfree(qspi->dev_ids); -- 2.33.0