Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b34a74 authored by Himanshu Aggarwal's avatar Himanshu Aggarwal
Browse files

Revert "leds: leds-qpnp-flash: synchronize LED switch node operation" 



This patch reverts 'commit c3f4946d ("leds: leds-qpnp-flash:
synchronize LED switch node operation")'

This was an incomplete fix which did not fix the synchronization issue
and also introduced a side-effect which caused switch node operations
to become a no-op.

CRs-Fixed: 1006961
Change-Id: Ibd4409595fa23a2dd3692385cc0932bbd3703d9f
Signed-off-by: default avatarHimanshu Aggarwal <haggarwa@codeaurora.org>
parent cfd42c3b

drivers/leds/leds-qpnp-flash.c

+16 −16
Original line number Diff line number Diff line
@@ -1253,18 +1253,6 @@ static void qpnp_flash_led_work(struct work_struct *work) 
		}

	}



	if (led->flash_node[led->num_leds - 1].id == FLASH_LED_SWITCH &&

					flash_node->id != FLASH_LED_SWITCH) {

		led->flash_node[led->num_leds - 1].trigger |=

						(0x80 >> flash_node->id);

		if (flash_node->id == FLASH_LED_0)

			led->flash_node[led->num_leds - 1].prgm_current =

						flash_node->prgm_current;

		else if (flash_node->id == FLASH_LED_1)

			led->flash_node[led->num_leds - 1].prgm_current2 =

						flash_node->prgm_current;

	}



	if (flash_node->type == TORCH) {

		rc = qpnp_led_masked_write(led->spmi_dev,

			FLASH_LED_UNLOCK_SECURE(led->base),
@@ -1674,10 +1662,6 @@ static void qpnp_flash_led_work(struct work_struct *work) 
	return;



turn_off:

	if (led->flash_node[led->num_leds - 1].id == FLASH_LED_SWITCH &&

					flash_node->id != FLASH_LED_SWITCH)

		led->flash_node[led->num_leds - 1].trigger &=

						~(0x80 >> flash_node->id);

	if (flash_node->type == TORCH) {

		/*

		 * Checking LED fault status detects hardware open fault.
@@ -1789,6 +1773,22 @@ static void qpnp_flash_led_brightness_set(struct led_classdev *led_cdev, 


			flash_node->prgm_current = value;

			flash_node->flash_on = value ? true : false;

			if (value)

				led->flash_node[led->num_leds - 1].trigger |=

						(0x80 >> flash_node->id);

			else

				led->flash_node[led->num_leds - 1].trigger &=

						~(0x80 >> flash_node->id);



			if (flash_node->id == FLASH_LED_0)

				led->flash_node[led->num_leds - 1].

				prgm_current = flash_node->prgm_current;

			else if (flash_node->id == FLASH_LED_1)

				led->flash_node[led->num_leds - 1].

				prgm_current2 =

				flash_node->prgm_current;



			return;

		} else if (flash_node->id == FLASH_LED_SWITCH) {

			if (!value) {

				flash_node->prgm_current = 0;