diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-04-24 17:56:29 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-04-24 12:21:22 -0400 |
| commit | 0e9f480bb553d39ee06ccd45639ba7a5446a7b81 (patch) | |
| tree | b6de3a76c45c5fdfc9a6d1229c77906d067b853a /drivers/mmc/core | |
| parent | 0dd1bfeb6cc89467261cc62ca81e0ac5da78ec0a (diff) | |
| download | linux-0e9f480bb553d39ee06ccd45639ba7a5446a7b81.tar.bz2 | |
mmc: cd-gpio: protect against NULL context in mmc_cd_gpio_free()
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]
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core')
| -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 2c14be73254c..f13e38deceac 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); |