diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-17 10:08:40 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-17 10:08:40 -0800 |
| commit | 3c8d77bac19b46fa07b3d30952e676a8445f1906 (patch) | |
| tree | 898409369e5201341135bfdcd0dea457e7c7c770 | |
| parent | 37d58e6c59584b5058f04890cc3ba86b7aded75c (diff) | |
| parent | b154d78e5dcd30b9515001d5b135d1d5cee0b222 (diff) | |
Merge "leds: qpnp-flash: Fix the mask in the flash prepare API"
| -rw-r--r-- | drivers/leds/leds-qpnp-flash.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/leds/leds-qpnp-flash.c b/drivers/leds/leds-qpnp-flash.c index 95b4c42a5adb..98dfa56add51 100644 --- a/drivers/leds/leds-qpnp-flash.c +++ b/drivers/leds/leds-qpnp-flash.c @@ -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; } |