diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-04-24 17:56:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-01 15:18:27 +0800 |
| commit | 6cd4efb3a17356075c8e3f1bd191b4d120714851 (patch) | |
| tree | b7c58b03e54ed5f2dcd1930674c7caf72e2e77ba | |
| parent | 11c8c735ebf68c754bdd94cebd307a96fcd95068 (diff) | |
| download | linux-3.10-6cd4efb3a17356075c8e3f1bd191b4d120714851.tar.gz linux-3.10-6cd4efb3a17356075c8e3f1bd191b4d120714851.tar.bz2 linux-3.10-6cd4efb3a17356075c8e3f1bd191b4d120714851.zip | |
mmc: cd-gpio: protect against NULL context in mmc_cd_gpio_free()
commit 0e9f480bb553d39ee06ccd45639ba7a5446a7b81 upstream.
Do not oops, even if mmc_cd_gpio_free() is mistakenly called on a driver
cleanup path, even though a previous call to mmc_cd_gpio_request() failed.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
[stable@: please apply to 3.3-stable]
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/mmc/core/cd-gpio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/core/cd-gpio.c b/drivers/mmc/core/cd-gpio.c index 2c14be73254..f13e38decea 100644 --- a/drivers/mmc/core/cd-gpio.c +++ b/drivers/mmc/core/cd-gpio.c @@ -73,6 +73,9 @@ void mmc_cd_gpio_free(struct mmc_host *host) { struct mmc_cd_gpio *cd = host->hotplug.handler_priv; + if (!cd) + return; + free_irq(host->hotplug.irq, host); gpio_free(cd->gpio); kfree(cd); |