From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751353AbdCZL0M (ORCPT <rfc822;w@1wt.eu>);
        Sun, 26 Mar 2017 07:26:12 -0400
Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51633 "EHLO
        out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1751264AbdCZL0L (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 26 Mar 2017 07:26:11 -0400
X-ME-Sender: <xms:UaXXWPwr3HJjAsllMKMKWpVmJ28I7seGgw0CBbiolEk1sYtMfZo_Sg>
X-Sasl-enc: NAHErC31BKAcobYYYlNq6Lhnb3lTrNsCkYiqQI6KJv/s 1490527569
Date: Sun, 26 Mar 2017 12:26:19 +0100
From: Andrey Utkin <andrey_utkin@fastmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Jonas Aaberg <cja@gmx.net>, Zhang Rui <rui.zhang@intel.com>,
        Adrian Hunter <adrian.hunter@intel.com>,
        Ulf Hansson <ulf.hansson@linaro.org>
Subject: Re: [PATCH 4.10 012/167] mmc: sdhci-acpi: support deferred probe
Message-ID: <20170326112619.GA4209@dell-m4800.Home>
References: <20170310083956.767605269@linuxfoundation.org>
 <20170310083957.651880524@linuxfoundation.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170310083957.651880524@linuxfoundation.org>
User-Agent: Mutt/1.7.2 (2016-11-26)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Mar 10, 2017 at 10:07:35AM +0100, Greg Kroah-Hartman wrote:
> 4.10-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Zhang Rui <rui.zhang@intel.com>
> 
> commit e28d6f048799acb0014491e6b74e580d84bd7916 upstream.
> 
> With commit 67bf5156edc4 ("gpio / ACPI: fix returned error from
> acpi_dev_gpio_irq_get()"), mmc_gpiod_request_cd() returns -EPROBE_DEFER if
> GPIO is not ready when sdhci-acpi driver is probed, and sdhci-acpi driver
> should be probed again later in this case.
> 
> This fixes an order issue when both GPIO and sdhci-acpi drivers are built
> as modules.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=177101
> Tested-by: Jonas Aaberg <cja@gmx.net>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> ---
>  drivers/mmc/host/sdhci-acpi.c |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> --- a/drivers/mmc/host/sdhci-acpi.c
> +++ b/drivers/mmc/host/sdhci-acpi.c
> @@ -467,7 +467,10 @@ static int sdhci_acpi_probe(struct platf
>  	if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) {
>  		bool v = sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL);
>  
> -		if (mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0, NULL)) {
> +		err = mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0, NULL);
> +		if (err) {
> +			if (err == -EPROBE_DEFER)
> +				goto err_free;
>  			dev_warn(dev, "failed to setup card detect gpio\n");
>  			c->use_runtime_pm = false;
>  		}
> 
> 

Regression reported: https://bugzilla.kernel.org/show_bug.cgi?id=194871

Reverting this patch is said to fix the issue for 4.10.2.