diff options
| author |   Chris Ball <cjb@laptop.org> | 2012-09-09 22:56:48 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-09-11 10:55:20 -0400 |
| commit | 15e8a8e42966162c207bb97ed55c803bc437eeae (patch) | |
| tree | e6136461d4d1bce995796a3518fe2eef08568964 /drivers/mmc/core | |
| parent | mmc: via-sdmmc: Use module_pci_driver (diff) | |
| download | linux-dev-15e8a8e42966162c207bb97ed55c803bc437eeae.tar.xz linux-dev-15e8a8e42966162c207bb97ed55c803bc437eeae.zip | |
mmc: slot-gpio: Fix missing assignment to ctx->ro_gpio
mmc_gpio_request_ro() doesn't store the requested gpio in ctx->ro_gpio.
As a result, subsequent calls to mmc_gpio_get_ro() will always fail
with -ENOSYS because the gpio number isn't available to that function.
Cc: stable <stable@vger.kernel.org>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/slot-gpio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c index 058242916cef..08c6b3dfe080 100644 --- a/drivers/mmc/core/slot-gpio.c +++ b/drivers/mmc/core/slot-gpio.c @@ -100,7 +100,13 @@ int mmc_gpio_request_ro(struct mmc_host *host, unsigned int gpio) ctx = host->slot.handler_priv; - return gpio_request_one(gpio, GPIOF_DIR_IN, ctx->ro_label); + ret = gpio_request_one(gpio, GPIOF_DIR_IN, ctx->ro_label); + if (ret < 0) + return ret; + + ctx->ro_gpio = gpio; + + return 0; } EXPORT_SYMBOL(mmc_gpio_request_ro); |