From mboxrd@z Thu Jan 1 00:00:00 1970 From: kishore.kadiyala@ti.com (kishore kadiyala) Date: Sat, 18 Sep 2010 22:04:05 +0530 (IST) Subject: [PATCH v2 2/4] omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set Message-ID: <33912.10.24.255.17.1284827645.squirrel@dbdmail.itg.ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Benoit Cousson Avoid possible crash if CONFIG_MMC_OMAP_HS is not set Signed-off-by: Benoit Cousson Signed-off-by: Kishore Kadiyala --- arch/arm/mach-omap2/board-4430sdp.c | 8 +++++++- 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 a49f285..ac8541c 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -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 omap4_twl6030_hsmmc_set_late_init\n"); + return; + } + pdata = dev->platform_data; pdata->init = omap4_twl6030_hsmmc_late_init; } -- 1.7.0.4