"kishore kadiyala" <kishore.kadiyala@xxxxxx> writes:
> From: Benoit Cousson <b-cousson@xxxxxx
> Avoid possible crash if CONFIG_MMC_OMAP_HS is not set
>
> Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
> Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Madhusudhan Chikkature <madhu.cr@xxxxxx>
> Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@xxxxxx>
This is another fix that should go upstream independently of the rest of
the series.
In fact, this should probably be fixed in 2.6.36-rc.
Kevin
> ---
> arch/arm/mach-omap2/board-4430sdp.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index 9447644..3a0dafd 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -235,8 +235,13 @@ 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)
> + return;
>
> + pdata = dev->platform_data;
> pdata->init = omap4_twl6030_hsmmc_late_init;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
