[PATCH] auxdisplay: img-ascii-lcd: fix maybe-uninitialized warning

[Xiongfeng Wang]

gcc prints the following warning:
drivers/auxdisplay/img-ascii-lcd.c: In function ‘malta_update’:
drivers/auxdisplay/img-ascii-lcd.c:109: warning: ‘err’ may be usedun 
initialized in this function
drivers/auxdisplay/img-ascii-lcd.c: In function ‘sead3_update’:
drivers/auxdisplay/img-ascii-lcd.c:207: warning: ‘err’ may be used 
uninitialized in this function

When ctx->cfg->num_chars is zero, there will be a false error info
printed. Fix this by recontruct the code and initializing the variable
'err' to zero.

Signed-off-by: Xiongfeng Wang <wangxiongfe...@huawei.com>
---
 drivers/auxdisplay/img-ascii-lcd.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/auxdisplay/img-ascii-lcd.c 
b/drivers/auxdisplay/img-ascii-lcd.c
index db040b3..15048c1 100644
--- a/drivers/auxdisplay/img-ascii-lcd.c
+++ b/drivers/auxdisplay/img-ascii-lcd.c
@@ -102,12 +102,11 @@ static void malta_update(struct img_ascii_lcd_ctx *ctx)
        for (i = 0; i < ctx->cfg->num_chars; i++) {
                err = regmap_write(ctx->regmap,
                                   ctx->offset + (i * 8), ctx->curr[i]);
-               if (err)
-                       break;
+               if (err) {
+                       pr_err_ratelimited("Failed to update LCD display: 
%d\n", err);
+                       return;
+               }
        }
-
-       if (unlikely(err))
-               pr_err_ratelimited("Failed to update LCD display: %d\n", err);
 }
 
 static struct img_ascii_lcd_config malta_config = {
@@ -180,32 +179,32 @@ static int sead3_wait_lcd_idle(struct img_ascii_lcd_ctx 
*ctx)
 static void sead3_update(struct img_ascii_lcd_ctx *ctx)
 {
        unsigned int i;
-       int err;
+       int err = 0;
 
        for (i = 0; i < ctx->cfg->num_chars; i++) {
                err = sead3_wait_lcd_idle(ctx);
                if (err)
-                       break;
+                       goto out_err;
 
                err = regmap_write(ctx->regmap,
                                   ctx->offset + SEAD3_REG_LCD_CTRL,
                                   SEAD3_REG_LCD_CTRL_SETDRAM | i);
                if (err)
-                       break;
+                       goto out_err;
 
                err = sead3_wait_lcd_idle(ctx);
                if (err)
-                       break;
+                       goto out_err;
 
                err = regmap_write(ctx->regmap,
                                   ctx->offset + SEAD3_REG_LCD_DATA,
                                   ctx->curr[i]);
                if (err)
-                       break;
+                       goto out_err;
        }
 
-       if (unlikely(err))
-               pr_err_ratelimited("Failed to update LCD display: %d\n", err);
+out_err:
+       pr_err_ratelimited("Failed to update LCD display: %d\n", err);
 }
 
 static struct img_ascii_lcd_config sead3_config = {
-- 
1.7.12.4

_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/linaro-dev