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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 00009C2D0CE for ; Sun, 29 Dec 2019 18:14:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF761207E0 for ; Sun, 29 Dec 2019 18:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643242; bh=8zHvYP0Gzde2DetqxjP/+n4pV0eXIBIfVJDS6jyzJ5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GMiGW5ZeK3lvFnKf3Q9jcX7zANR1+L17X79mE6E+0sP6LKx/+qS878cPYMkm9IzY6 uN4HbpKbnKCzbllPskDaaWrAaf6ZkR64v+GnBCZ+0UbGZhh1AAaYA4xG8jNJxIrr6F Ec5/ah1O5qppnxvlGKNTciK/XkseK1NjE3v5yyOU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728452AbfL2SOA (ORCPT ); Sun, 29 Dec 2019 13:14:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:49926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728434AbfL2R1d (ORCPT ); Sun, 29 Dec 2019 12:27:33 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 306D320409; Sun, 29 Dec 2019 17:27:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640452; bh=8zHvYP0Gzde2DetqxjP/+n4pV0eXIBIfVJDS6jyzJ5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C0LpRJuzKlyxawv2iOG7KkD6ANT65rB45LTEG4ZqqDzSR5Ks5v0y4B24UAE+7tfD8 Od1FlMDNt4E5lecuGiweskADMt7sU1e5bjLgBhc7Men+wTBiUHtCziK/zcN2gZm9V0 eHFbrbdaP1cXQ29jjaMOmwsSjgYCeBAXa8xhP9MA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , Mark Brown , Sasha Levin Subject: [PATCH 4.14 125/161] spi: st-ssc4: add missed pm_runtime_disable Date: Sun, 29 Dec 2019 18:19:33 +0100 Message-Id: <20191229162436.693134986@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 a4e43fc19ece..5df01ffdef46 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