Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eae9b85b authored by Damian Hobson-Garcia's avatar Damian Hobson-Garcia Committed by Paul Mundt
Browse files

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: default avatarDamian Hobson-Garcia <dhobsong@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 3fedd2ac

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;