Merge "drivers: leds-qpnp: fix issues raised by static analyser" (05aa5a54) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/leds/leds-qpnp.c

+7 −7

Original line number	Diff line number	Diff line

		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1251,7 +1251,7 @@ regulator_turn_off:

		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)
		@@ -1289,8 +1289,8 @@ static int qpnp_flash_set(struct qpnp_led_data *led)
		}
		}

		qpnp_led_masked_write(led, FLASH_MAX_CURR(led->base),
		FLASH_CURRENT_MASK,
		rc = qpnp_led_masked_write(led,
		FLASH_MAX_CURR(led->base), FLASH_CURRENT_MASK,
		TORCH_MAX_LEVEL);
		if (rc) {
		dev_err(&led->spmi_dev->dev,
		@@ -1299,7 +1299,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);
		@@ -1331,7 +1331,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);
		@@ -1379,7 +1379,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);