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

Commit 554cc102 authored by Paul Mundt's avatar Paul Mundt
Browse files

fbdev: sh_mobile_lcdcfb: Fix up fallout from MERAM changes. 



The LCDC driver does no longer compile:

  CC      drivers/video/sh_mobile_meram.o
  CC      drivers/video/sh_mobile_lcdcfb.o
drivers/video/sh_mobile_lcdcfb.c: In function 'sh_mobile_lcdc_start':
drivers/video/sh_mobile_lcdcfb.c:640:4: error: 'ret' undeclared (first use in this function)
drivers/video/sh_mobile_lcdcfb.c:640:4: note: each undeclared identifier is reported only once for each function it appears in
make[2]: *** [drivers/video/sh_mobile_lcdcfb.o] Error 1
make[1]: *** [drivers/video] Error 2
make: *** [drivers] Error 2

Reported-by: default avatarMagnus Damm <magnus.damm@gmail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 1fa7b6a2

drivers/video/sh_mobile_lcdcfb.c

+2 −2
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) 
	unsigned long tmp;

	int bpp = 0;

	unsigned long ldddsr;

	int k, m;

	int k, m, ret;



	/* enable clocks before accessing the hardware */

	for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
@@ -540,7 +540,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) 


		board_cfg = &ch->cfg.board_cfg;

		if (board_cfg->setup_sys) {

			int ret = board_cfg->setup_sys(board_cfg->board_data,

			ret = board_cfg->setup_sys(board_cfg->board_data,

						ch, &sh_mobile_lcdc_sys_bus_ops);

			if (ret)

				return ret;