diff options
| author | Damian <dhobsong@igel.co.jp> | 2011-05-24 07:01:21 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-25 11:43:11 +0900 |
| commit | eae9b85b5f65027df64130d8a3eeb2de9d094eda (patch) | |
| tree | 684eab3286396d934d640d3089c1277bc7f38873 /drivers/video/sh_mobile_lcdcfb.c | |
| parent | 3fedd2ac7662a10ab2973d3b6f11cdce87b7171a (diff) | |
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 <dhobsong@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 1c652da348e..edf0d32b26c 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; |