On Sun, 2017-03-26 at 12:26 +0100, Andrey Utkin wrote:
> 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.zh...@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 <c...@gmx.net>
> > Signed-off-by: Zhang Rui <rui.zh...@intel.com>
> > Acked-by: Adrian Hunter <adrian.hun...@intel.com>
> > Signed-off-by: Ulf Hansson <ulf.hans...@linaro.org>
> > Signed-off-by: Greg Kroah-Hartman <gre...@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=1948
> 71
> 
> Reverting this patch is said to fix the issue for 4.10.2.

thanks for raising the issue. Let's see check why it breaks in the
bugzilla report.

thanks,
rui

Reply via email to