Commit 344fa142 authored by Ulf Hansson's avatar Ulf Hansson Committed by Greg Kroah-Hartman

mmc: core: Don't return an error for CD/WP GPIOs when GPIOLIB is unset

commit 43934ece upstream.

When CONFIG_GPIOLIB is unset, its stubs will return -ENOSYS. That means
when the mmc core parses DT for CD/WP GPIOs via mmc_of_parse(), -ENOSYS
becomes propagated to the caller. Typically this means that the mmc host
driver fails to probe.

As the CD/WP GPIOs are already treated as optional, let's extend that to
cover the case when CONFIG_GPIOLIB is unset.
Reported-by: default avatarMichal Simek <michal.simek@xilinx.com>
Fixes: 16b23787 ("mmc: sdhci-of-arasan: Call OF parsing for MMC")
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarMichal Simek <michal.simek@xilinx.com>
Acked-by: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1d40e01
...@@ -373,7 +373,7 @@ int mmc_of_parse(struct mmc_host *host) ...@@ -373,7 +373,7 @@ int mmc_of_parse(struct mmc_host *host)
0, &cd_gpio_invert); 0, &cd_gpio_invert);
if (!ret) if (!ret)
dev_info(host->parent, "Got CD GPIO\n"); dev_info(host->parent, "Got CD GPIO\n");
else if (ret != -ENOENT) else if (ret != -ENOENT && ret != -ENOSYS)
return ret; return ret;
/* /*
...@@ -397,7 +397,7 @@ int mmc_of_parse(struct mmc_host *host) ...@@ -397,7 +397,7 @@ int mmc_of_parse(struct mmc_host *host)
ret = mmc_gpiod_request_ro(host, "wp", 0, false, 0, &ro_gpio_invert); ret = mmc_gpiod_request_ro(host, "wp", 0, false, 0, &ro_gpio_invert);
if (!ret) if (!ret)
dev_info(host->parent, "Got WP GPIO\n"); dev_info(host->parent, "Got WP GPIO\n");
else if (ret != -ENOENT) else if (ret != -ENOENT && ret != -ENOSYS)
return ret; return ret;
/* See the comment on CD inversion above */ /* See the comment on CD inversion above */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment