Patch "mmc: sdhci-acpi: support deferred probe" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
mmc: sdhci-acpi: support deferred probe
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-sdhci-acpi-support-deferred-probe.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e28d6f048799acb0014491e6b74e580d84bd7916Mon Sep 17 00:00:00 2001
From: Zhang Rui <[email protected]>
Date: Wed, 18 Jan 2017 17:46:18 +0800
Subject: mmc: sdhci-acpi: support deferred probe
From: Zhang Rui <[email protected]>
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
--- drivers/mmc/host/sdhci-acpi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-acpi.c +4 -1
@@ -466,7 +466,10 @@ static int sdhci_acpi_probe(struct platfif (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; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/mmc-sdhci-acpi-support-deferred-probe.patch