backlight: lm3639: don't mix different enum types
authorJingoo Han <jg1.han@samsung.com>
Tue, 12 Nov 2013 23:09:02 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 03:09:15 +0000 (12:09 +0900)
Don't mix different enum types to fix the sparse warnings.

  drivers/video/backlight/lm3639_bl.c:80:51: warning: mixing different enum types
  drivers/video/backlight/lm3639_bl.c:80:51:     int enum lm3639_fleds  versus
  drivers/video/backlight/lm3639_bl.c:80:51:     int enum lm3639_bleds
  drivers/video/backlight/lm3639_bl.c:82:51: warning: mixing different enum types
  drivers/video/backlight/lm3639_bl.c:82:51:     int enum lm3639_fleds  versus
  drivers/video/backlight/lm3639_bl.c:82:51:     int enum lm3639_bleds

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/lm3639_bl.c

index 053964da8dd3015e2a96ff2d7d9b5083dc6c4653..6c888e39e4cd9ceb36cdf7b9f73566521a17eaf1 100644 (file)
@@ -76,10 +76,13 @@ static int lm3639_chip_init(struct lm3639_chip_data *pchip)
                goto out;
 
        /* output pins config. */
-       if (!pdata->init_brt_led)
-               reg_val = pdata->fled_pins | pdata->bled_pins;
-       else
-               reg_val = pdata->fled_pins | pdata->bled_pins | 0x01;
+       if (!pdata->init_brt_led) {
+               reg_val = pdata->fled_pins;
+               reg_val |= pdata->bled_pins;
+       } else {
+               reg_val = pdata->fled_pins;
+               reg_val |= pdata->bled_pins | 0x01;
+       }
 
        ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x79, reg_val);
        if (ret < 0)