From 0e85ea5b839fb5417227d6102faefb622136c62b Mon Sep 17 00:00:00 2001 From: David Anders Date: Thu, 7 Oct 2010 19:36:29 +0000 Subject: [PATCH] --- yaml --- r: 216998 b: refs/heads/master c: b9b52620823f84f95f3fd94dd6769b7102d7888a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-omap4panda.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 07714d28774f..20298598fe3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 191183b94cc511d0fc2326c83165d95aeabacac4 +refs/heads/master: b9b52620823f84f95f3fd94dd6769b7102d7888a diff --git a/trunk/arch/arm/mach-omap2/board-omap4panda.c b/trunk/arch/arm/mach-omap2/board-omap4panda.c index d8c70c13953a..e9c6b24361bc 100644 --- a/trunk/arch/arm/mach-omap2/board-omap4panda.c +++ b/trunk/arch/arm/mach-omap2/board-omap4panda.c @@ -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; }