Merge "leds: leds-qpnp: Fix uninitialized variable use" (e65d8115) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/leds/leds-qpnp.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -1213,7 +1213,7 @@ static int qpnp_torch_regulator_operate(struct qpnp_led_data *led, bool on)

		static int qpnp_flash_set(struct qpnp_led_data *led)
		{
		int rc, error;
		int rc = 0, error;
		int val = led->cdev.brightness;

		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,
		TORCH_MAX_LEVEL);
		if (rc) {
		@@ -1261,7 +1262,7 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
		goto error_reg_write;
		}

		qpnp_led_masked_write(led,
		rc = qpnp_led_masked_write(led,
		FLASH_LED_TMR_CTRL(led->base),
		FLASH_TMR_MASK,
		FLASH_TMR_WATCHDOG);
		@@ -1293,7 +1294,7 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
		goto error_reg_write;
		}

		qpnp_led_masked_write(led,
		rc = qpnp_led_masked_write(led,
		FLASH_WATCHDOG_TMR(led->base),
		FLASH_WATCHDOG_MASK,
		led->flash_cfg->duration);
		@@ -1341,7 +1342,7 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
		goto error_flash_set;
		}

		qpnp_led_masked_write(led,
		rc = qpnp_led_masked_write(led,
		FLASH_LED_TMR_CTRL(led->base),
		FLASH_TMR_MASK,
		FLASH_TMR_SAFETY);