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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 A314FC49ED7 for ; Sun, 22 Sep 2019 18:45:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7605D208C0 for ; Sun, 22 Sep 2019 18:45:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177901; bh=HlnVsCceNYZyYai/sxKuhEPWoP8UASBPHV6OlRRXLRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AMX78/2VKb5OHqsZsnqJQvzOgmybt6WRKF7n9ppJBC23gScoLaTW3bWujke60bKFw NuG+7qxMsqu0U+7k6vt/+MaLy786uc4r4xIHWns9Q/V73AOHEHooRoWpAwIPy40gVZ admDIEY/67Sj2I1kGVnWyiZqvkA0Qhkuha6iUOl4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388664AbfIVSoB (ORCPT ); Sun, 22 Sep 2019 14:44:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:39616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388156AbfIVSoA (ORCPT ); Sun, 22 Sep 2019 14:44:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 58B4D20882; Sun, 22 Sep 2019 18:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177839; bh=HlnVsCceNYZyYai/sxKuhEPWoP8UASBPHV6OlRRXLRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jWoK2FxZmQIBc2O2mzd6MBZmkgFGKG/weUBSl4wr7eyJIBZaaTX+1C5z+Nx43NzVx KSvRjJVs0/rjaS6jxTubtRJU3FyLyfEC6R3Jn+uhSS5P7rqDe2MjKYTvDw7s5DtXEp xB8tRSiI/iNSM0u05DrA4MyQpVAl83AtN4mR6RB8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Shevchenko , Phil Edworthy , Gareth Williams , Mark Brown , Sasha Levin , linux-spi@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 007/203] spi: dw-mmio: Clock should be shut when error occurs Date: Sun, 22 Sep 2019 14:40:33 -0400 Message-Id: <20190922184350.30563-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Shevchenko [ Upstream commit 3da9834d9381dd99273f2ad4e6d096c9187dc4f2 ] When optional clock requesting fails, the main clock is still up and running, we should shut it down in such caee. Fixes: 560ee7e91009 ("spi: dw: Add support for an optional interface clock") Cc: Phil Edworthy Cc: Gareth Williams Signed-off-by: Andy Shevchenko Reviewed-by: Gareth Williams Link: https://lore.kernel.org/r/20190710114243.30101-1-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-dw-mmio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 18c06568805e7..86789dbaf5771 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -172,8 +172,10 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) /* Optional clock needed to access the registers */ dwsmmio->pclk = devm_clk_get_optional(&pdev->dev, "pclk"); - if (IS_ERR(dwsmmio->pclk)) - return PTR_ERR(dwsmmio->pclk); + if (IS_ERR(dwsmmio->pclk)) { + ret = PTR_ERR(dwsmmio->pclk); + goto out_clk; + } ret = clk_prepare_enable(dwsmmio->pclk); if (ret) goto out_clk; -- 2.20.1