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,USER_AGENT_GIT autolearn=ham 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 C168DC43603 for ; Tue, 10 Dec 2019 21:37:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89D302073B for ; Tue, 10 Dec 2019 21:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013839; bh=CFeG6hHCIUTpfpt8mweoDzuL837g4k5/WJx5IMGwZiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cD0xFsFfMf9tRorgYwlnr/5KSJzoI6p3gXfjMZWqfHLAFvVj8EI2cn/TcU119un7m GsQ7+pTKaauJSBHfronNg0D7B8+AZhko8a4aDXQNtavPLpXb5HEhsCjRIV8mi2wj0u NwtcSFH8mm4N9bOPkpLVDGWD0VCuxhBAhpBLWB5c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730318AbfLJVhS (ORCPT ); Tue, 10 Dec 2019 16:37:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:41468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730308AbfLJVff (ORCPT ); Tue, 10 Dec 2019 16:35:35 -0500 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 A511E2467B; Tue, 10 Dec 2019 21:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013735; bh=CFeG6hHCIUTpfpt8mweoDzuL837g4k5/WJx5IMGwZiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nJps+PzNurMZWBV0L8Tf0lPkOdPxhVVq4F9KgdtWJjOSwxVCWrjw4ndvEyU3FsXTj bPzY2Vz6OGQHbCUVDpKEKxTqcbQjGXJJnCTnPYzr73WZCu4RC0wzahGo87/AmTepgi ZYOx0PNwl/JTb0A3PxIdwQEmY/Pe8FBVp7d8iEwQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuhong Yuan , Mark Brown , Sasha Levin , linux-spi@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 159/177] spi: st-ssc4: add missed pm_runtime_disable Date: Tue, 10 Dec 2019 16:32:03 -0500 Message-Id: <20191210213221.11921-159-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-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: Chuhong Yuan [ Upstream commit cd050abeba2a95fe5374eec28ad2244617bcbab6 ] The driver forgets to call pm_runtime_disable in probe failure and remove. Add the missed calls to fix it. Signed-off-by: Chuhong Yuan Link: https://lore.kernel.org/r/20191118024848.21645-1-hslester96@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-st-ssc4.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c index a4e43fc19ece5..5df01ffdef468 100644 --- a/drivers/spi/spi-st-ssc4.c +++ b/drivers/spi/spi-st-ssc4.c @@ -385,6 +385,7 @@ static int spi_st_probe(struct platform_device *pdev) return 0; clk_disable: + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(spi_st->clk); put_master: spi_master_put(master); @@ -396,6 +397,8 @@ static int spi_st_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct spi_st *spi_st = spi_master_get_devdata(master); + pm_runtime_disable(&pdev->dev); + clk_disable_unprepare(spi_st->clk); pinctrl_pm_select_sleep_state(&pdev->dev); -- 2.20.1