omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
authorDavid Anders <x0132446@ti.com>
Thu, 7 Oct 2010 19:36:29 +0000 (19:36 +0000)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 18:06:34 +0000 (11:06 -0700)
Avoid possible crash if CONFIG_MMC_OMAP_HS is not set.

Signed-off-by: David Anders <x0132446@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-omap4panda.c

index d8c70c1..e9c6b24 100644 (file)
@@ -116,7 +116,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 omap4_twl6030_hsmmc_set_late_init\n");
+               return;
+       }
+       pdata = dev->platform_data;
 
        pdata->init =   omap4_twl6030_hsmmc_late_init;
 }