From patchwork Mon Aug 5 13:02:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 170539 Delivered-To: patch@linaro.org Received: by 2002:ac9:2daa:0:0:0:0:0 with SMTP id g42csp4155127oce; Mon, 5 Aug 2019 06:23:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdjN9CSds5g1qLbCvj5bi8FRft9wTcxivAGQNJxGKIo44BuNucRlRUJztisF5IsPcZxV7S X-Received: by 2002:a63:5b52:: with SMTP id l18mr136827076pgm.21.1565011431636; Mon, 05 Aug 2019 06:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565011431; cv=none; d=google.com; s=arc-20160816; b=cYmExU974zIl3KBKafaWrDCj8kgc4m3/wC4RBYWuS0DvMbLSAhbit/VI04nhoF/K9B k/5AUMdCKXi7ZlSQ1y6LBrgfVngjU0o1Vq7Fat8o6lPNPWLWJcqPtdszBKIyqZ1LO2V5 Gw/06S6K64YK3KnuqH5fs42NP7A+xvqIsxFH4H+vgWtIr4CER1w0qde1VmszJ7gWf7ZY efRoSOjcf/EMPcRMQlWPIIOQNyOaoxgs5/wQTK3y9PGBfLrqVN5FoWMy1yqWRYslO70C W2VWHN5lr8nWGo0COxn9uezXsqSIkA963pA3mkobFJHnMQdyjk4DqSpmQUCwZJjmHYaQ wVMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=X92B/LBI62NjwXpE7TwC4Wv2CbtXpzJiUiIl7EhXeDo=; b=z6ZO7Ix0RdfGneYcvBN+pN+BVCFSmKPon7okNuaf9mkAohu9f4mShPnnoK18ZKRidf BuAxZDNC5wM4xJAOOm2tpUQymb9KPtraEci4EWWe6m8CM9nsYVssUjt3mulNzDWb15t5 X9/jhLVBXsCEiumFka3mmqxlC9tI6xJ7UcftuCGNNY4vsHoguFsbSY6EwkgEm5PwwJ2Z N5WWgX7TvkR4ICldbsk9ts6Q9JJ/6WK6IUmmvdnHv7PsQuU55Ciol23q69uEAjD3VfiZ Ti6t+BpLnXI5zmKRT3rKSXknnJ4TEOEGNUl8dJT8wTQ3RU9RWQFbV9oUffscSsSUNv1E jsJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wT57fk8b; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 193si45437793pfz.124.2019.08.05.06.23.51; Mon, 05 Aug 2019 06:23:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wT57fk8b; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730879AbfHENXu (ORCPT + 14 others); Mon, 5 Aug 2019 09:23:50 -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 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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);