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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 E1B1BC0650F for ; Mon, 5 Aug 2019 13:23:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B86FB2087B for ; Mon, 5 Aug 2019 13:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011435; bh=V2Q70GTfv3oZzNZd5F8MMLlNY9oeJq+bcMPgLj65Nq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Bn3ks/kGotB91zU7aUdvBBXUeNUaF4tPijPrK5eIQyOusXC6Px6KcL8AmHygP0Rpo amdc7g9kA0nHCe7VpoEI8pE8xiV3hhtNe2A55IisGCrNEAb3J5dVLtCoL6dh1OVm7X Lna9BhYhn6ob7puVLVr2ZQOqgNp6IqPNh/O3lvjc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730919AbfHENXy (ORCPT ); Mon, 5 Aug 2019 09:23:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:60594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730829AbfHENXu (ORCPT ); Mon, 5 Aug 2019 09:23:50 -0400 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 281AC20651; Mon, 5 Aug 2019 13:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011429; bh=V2Q70GTfv3oZzNZd5F8MMLlNY9oeJq+bcMPgLj65Nq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wT57fk8b5ZtA0+FcAchO2G1ETX8AquRgnRh6rt4eR+8DyjazsVjUFKIiejgGHDi76 qyv735LBVXU9IfjvXKq7CYjk2ipgNQ1bXARLp5oUQFG5B4/zOuKVDUuunpG4GNutMQ uZuE2efy5I8mW5Wp7VMMnwjX4CPi+hSGdqIrI1dQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Baolin Wang , Adrian Hunter , Ulf Hansson Subject: [PATCH 5.2 085/131] mmc: host: sdhci-sprd: Fix the missing pm_runtime_put_noidle() Date: Mon, 5 Aug 2019 15:02:52 +0200 Message-Id: <20190805124957.654638392@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190805124951.453337465@linuxfoundation.org> References: <20190805124951.453337465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Baolin Wang commit fc62113b32c95906b3ea8ba42e91014c7d0c6fa6 upstream. When the SD host controller tries to probe again due to the derferred probe mechanism, it will always keep the SD host device as runtime resume state due to missing the runtime put operation in error path last time. Thus add the pm_runtime_put_noidle() in error path to make the PM runtime counter balance, which can make the SD host device's PM runtime work well. Signed-off-by: Baolin Wang Acked-by: Adrian Hunter Fixes: fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller") Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-sprd.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/mmc/host/sdhci-sprd.c +++ b/drivers/mmc/host/sdhci-sprd.c @@ -405,6 +405,7 @@ err_cleanup_host: sdhci_cleanup_host(host); pm_runtime_disable: + pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);