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

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

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-17 10:08:40 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3c8d77bac1
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/leds/leds-qpnp-flash.c
View file

@ -82,7 +82,6 @@
#define FLASH_LED_HDRM_SNS_ENABLE_MASK 0x81 #define FLASH_LED_HDRM_SNS_ENABLE_MASK 0x81
#define FLASH_MASK_MODULE_CONTRL_MASK 0xE0 #define FLASH_MASK_MODULE_CONTRL_MASK 0xE0
#define FLASH_FOLLOW_OTST2_RB_MASK 0x08 #define FLASH_FOLLOW_OTST2_RB_MASK 0x08
#define FLASH_PREPARE_OPTIONS_MASK 0x08
#define FLASH_LED_TRIGGER_DEFAULT "none" #define FLASH_LED_TRIGGER_DEFAULT "none"
#define FLASH_LED_HEADROOM_DEFAULT_MV 500 #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); flash_node = container_of(led_cdev, struct flash_node_data, cdev);
led = dev_get_drvdata(&flash_node->pdev->dev); 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); dev_err(&led->pdev->dev, "Invalid options %d\n", options);
return -EINVAL; return -EINVAL;
} }