aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-4430sdp.c
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2010-10-01 19:35:26 -0400
committerTony Lindgren <tony@atomide.com>2010-10-01 19:35:26 -0400
commit531c21ba1a298422ace28efbcdf94d5579a1b702 (patch)
tree7b78e3529a77c4c0afb04a7c46e276c7e7b371c3 /arch/arm/mach-omap2/board-4430sdp.c
parent07ad64b60c4d1f2bdbefa5db29ccb235596bc670 (diff)
omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set
Avoid possible crash if CONFIG_MMC_OMAP_HS is not set Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Madhusudhan Chikkature <madhu.cr@ti.com> Cc: Adrian Hunter <adrian.hunter@nokia.com> Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-4430sdp.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 1bed1e666a60..cdb93734dd72 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -275,8 +275,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
275 275
276static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev) 276static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
277{ 277{
278 struct omap_mmc_platform_data *pdata = dev->platform_data; 278 struct omap_mmc_platform_data *pdata;
279 279
280 /* dev can be null if CONFIG_MMC_OMAP_HS is not set */
281 if (!dev) {
282 pr_err("Failed %s\n", __func__);
283 return;
284 }
285 pdata = dev->platform_data;
280 pdata->init = omap4_twl6030_hsmmc_late_init; 286 pdata->init = omap4_twl6030_hsmmc_late_init;
281} 287}
282 288