Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 (087faf77) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/sh_mobile_lcdcfb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;