Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/lin…

…ux/kernel/git/lethal/sh-2.6
git-mirror · May 25, 2011 · 087faf7 · 087faf7
2 parents e2968f7 + eae9b85
commit 087faf7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;