From bb2cbdaafc2de4ddfbb8ca197ce022a37f47e712 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 5 May 2011 16:32:36 +0000 Subject: [PATCH] --- yaml --- r: 251094 b: refs/heads/master c: 69843ba7f24950f8ef5dadacfbfbd08f53e3455b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0caf22e6cd7c..3afc25f729aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81df448eb02db14128875a6cff90876b39422a6d +refs/heads/master: 69843ba7f24950f8ef5dadacfbfbd08f53e3455b diff --git a/trunk/drivers/video/sh_mobile_lcdcfb.c b/trunk/drivers/video/sh_mobile_lcdcfb.c index 9bcc61b4ef14..466834c604da 100644 --- a/trunk/drivers/video/sh_mobile_lcdcfb.c +++ b/trunk/drivers/video/sh_mobile_lcdcfb.c @@ -469,7 +469,6 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) int bpp = 0; unsigned long ldddsr; int k, m; - int ret = 0; /* enable clocks before accessing the hardware */ for (k = 0; k < ARRAY_SIZE(priv->ch); k++) { @@ -538,11 +537,12 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) lcdc_write_chan(ch, LDPMR, 0); board_cfg = &ch->cfg.board_cfg; - if (board_cfg->setup_sys) - ret = board_cfg->setup_sys(board_cfg->board_data, ch, - &sh_mobile_lcdc_sys_bus_ops); - if (ret) - return ret; + if (board_cfg->setup_sys) { + int ret = board_cfg->setup_sys(board_cfg->board_data, + ch, &sh_mobile_lcdc_sys_bus_ops); + if (ret) + return ret; + } } /* word and long word swap */