Skip to content

Commit

Permalink
sh_mobile_meram: Safely disable MERAM operation when not initialized
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Damian authored and Paul Mundt committed May 25, 2011
1 parent 3fedd2a commit eae9b85
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/video/sh_mobile_lcdcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit eae9b85

Please sign in to comment.