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

Commit 3c8d77ba authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "leds: qpnp-flash: Fix the mask in the flash prepare API"

parents 37d58e6c b154d78e

drivers/leds/leds-qpnp-flash.c

+1 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ 
#define FLASH_LED_HDRM_SNS_ENABLE_MASK				0x81

#define	FLASH_MASK_MODULE_CONTRL_MASK				0xE0

#define FLASH_FOLLOW_OTST2_RB_MASK				0x08

#define FLASH_PREPARE_OPTIONS_MASK				0x08



#define FLASH_LED_TRIGGER_DEFAULT				"none"

#define FLASH_LED_HEADROOM_DEFAULT_MV				500
@@ -1172,7 +1171,7 @@ int qpnp_flash_led_prepare(struct led_trigger *trig, int options, 
	flash_node = container_of(led_cdev, struct flash_node_data, cdev);

	led = dev_get_drvdata(&flash_node->pdev->dev);



	if (!(options & FLASH_PREPARE_OPTIONS_MASK)) {

	if (!(options & FLASH_LED_PREPARE_OPTIONS_MASK)) {

		dev_err(&led->pdev->dev, "Invalid options %d\n", options);

		return -EINVAL;

	}