From: Damian Date: Tue, 24 May 2011 07:01:21 +0000 (+0000) Subject: sh_mobile_meram: Safely disable MERAM operation when not initialized X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=eae9b85b5f65027df64130d8a3eeb2de9d094eda;p=deliverable%2Flinux.git sh_mobile_meram: Safely disable MERAM operation when not initialized If the MERAM platform data is defined, but the MERAM has not been properly initaliazed we need to safely fall back to non-MERAM operation. Signed-off-by: Damian Hobson-Garcia Signed-off-by: Paul Mundt --- diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 1c652da348ea..edf0d32b26c4 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -610,7 +610,8 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) pitch = ch->info->fix.line_length; /* test if we can enable meram */ - if (ch->cfg.meram_cfg && priv->meram_dev) { + if (ch->cfg.meram_cfg && priv->meram_dev && + priv->meram_dev->ops) { struct sh_mobile_meram_cfg *cfg; struct sh_mobile_meram_info *mdev; unsigned long icb_addr_y, icb_addr_c;