diff options
| author | Benoit Cousson <[email protected]> | 2010-10-01 16:35:26 -0700 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2010-10-01 16:35:26 -0700 |
| commit | 531c21ba1a298422ace28efbcdf94d5579a1b702 (patch) | |
| tree | 7b78e3529a77c4c0afb04a7c46e276c7e7b371c3 | |
| parent | 07ad64b60c4d1f2bdbefa5db29ccb235596bc670 (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 <[email protected]>
Cc: Madhusudhan Chikkature <[email protected]>
Cc: Adrian Hunter <[email protected]>
Signed-off-by: Benoit Cousson <[email protected]>
Signed-off-by: Kishore Kadiyala <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
| -rw-r--r-- | 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 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) 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; } |