evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "leds: leds-qpnp: Fix uninitialized variable use"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-25 15:52:14 -07:00 • committed by Gerrit - the friendly Code Review server
commit b8b329161d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/leds/leds-qpnp.c
View file

@ -1213,7 +1213,7 @@ regulator_turn_off:
static int qpnp_flash_set(struct qpnp_led_data *led) static int qpnp_flash_set(struct qpnp_led_data *led)
{ {
int rc, error; int rc = 0, error;
int val = led->cdev.brightness; int val = led->cdev.brightness;
if (led->flash_cfg->torch_enable) if (led->flash_cfg->torch_enable)
@ -1251,7 +1251,8 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
} }
} }
qpnp_led_masked_write(led, FLASH_MAX_CURR(led->base), rc = qpnp_led_masked_write(led,
FLASH_MAX_CURR(led->base),
FLASH_CURRENT_MASK, FLASH_CURRENT_MASK,
TORCH_MAX_LEVEL); TORCH_MAX_LEVEL);
if (rc) { if (rc) {
@ -1261,7 +1262,7 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
goto error_reg_write; goto error_reg_write;
} }
qpnp_led_masked_write(led, rc = qpnp_led_masked_write(led,
FLASH_LED_TMR_CTRL(led->base), FLASH_LED_TMR_CTRL(led->base),
FLASH_TMR_MASK, FLASH_TMR_MASK,
FLASH_TMR_WATCHDOG); FLASH_TMR_WATCHDOG);
@ -1293,7 +1294,7 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
goto error_reg_write; goto error_reg_write;
} }
qpnp_led_masked_write(led, rc = qpnp_led_masked_write(led,
FLASH_WATCHDOG_TMR(led->base), FLASH_WATCHDOG_TMR(led->base),
FLASH_WATCHDOG_MASK, FLASH_WATCHDOG_MASK,
led->flash_cfg->duration); led->flash_cfg->duration);
@ -1341,7 +1342,7 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
goto error_flash_set; goto error_flash_set;
} }
qpnp_led_masked_write(led, rc = qpnp_led_masked_write(led,
FLASH_LED_TMR_CTRL(led->base), FLASH_LED_TMR_CTRL(led->base),
FLASH_TMR_MASK, FLASH_TMR_MASK,
FLASH_TMR_SAFETY); FLASH_TMR_SAFETY);