Skip to contentSkip to conversation

omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set

PATCH New kishore kadiyala 2 participants 2 messages Sep 24, 2010 – Sep 28, 2010

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

PATCH v4 2/4 omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set

From: Benoit Cousson <[email protected]>

Avoid possible crash if CONFIG_MMC_OMAP_HS is not set

Cc Tony Lindgren <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Madhusudhan Chikkature <[email protected]>
Cc Adrian Hunter <[email protected]>
---
 arch/arm/mach-omap2/board-4430sdp.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-4430sdp.c +7 -1
index a49f285..7978a79 100644
@@ -240,8 +240,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
 
 static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
 {
-	struct omap_mmc_platform_data *pdata = dev->platform_data;
+	struct omap_mmc_platform_data *pdata;
 
+	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */
+	if (!dev) {
+		pr_err("Failed %s\n", __func__);
+		return;
+	}
+	pdata = dev->platform_data;
 	pdata->init =	omap4_twl6030_hsmmc_late_init;
 }
 
Signature · 1 line
1.7.0.4
maintainer
#1 lore raw

PATCH v4 2/4 omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set

Quoted 3 lines · kishore kadiyala

From: Benoit Cousson <[email protected]>

Avoid possible crash if CONFIG_MMC_OMAP_HS is not set

Will queue this and patches 3/4 and 4/4 of this series for the upcoming merge window.

Tony