Skip to contentSkip to conversation

OMAP: HSMMC: Fix oops in omap_mmc_remove

PATCH In review Adrian Hunter 1 participant 1 message Nov 21, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 5/9 OMAP: HSMMC: Fix oops in omap_mmc_remove

Do not access host in omap_mmc_remove() if it is null. This occurs when module is removed before its platform data is set.

---
drivers/mmc/host/omap_hsmmc.c | 20 +++++++++++---------

1 files changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/host/omap_hsmmc.c +0 -0
index 4bc25c0..f4b7c30 100644
@@ -1128,15 +1128,17 @@ static int omap_mmc_remove(struct platform_device *pdev)
	struct resource *res;
	u16 vdd = 0;

- mmc_omap_fclk_state(host, ON);
- if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) {
- /*
- * Set the vdd back to 3V,
- * applicable for dual volt support.
- */
- vdd = fls(host->mmc->ocr_avail) - 1;
- if (omap_mmc_switch_opcond(host, vdd) != 0)
- host->mmc->ios.vdd = vdd;
+ if (host) {
+ mmc_omap_fclk_state(host, ON);
+ if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) {
+ /*
+ * Set the vdd back to 3V,
+ * applicable for dual volt support.
+ */
+ vdd = fls(host->mmc->ocr_avail) - 1;
+ if (omap_mmc_switch_opcond(host, vdd) != 0)
+ host->mmc->ios.vdd = vdd;
+ }

	}

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Signature · 1 line
1.5.4.3