diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 14:55:08 +0000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 14:55:08 +0000 |
commit | 2367da5b51cd2819d630432e6a8876f973b1bbc3 (patch) | |
tree | 83b51a03dfb434ba056f143b8f587670534fa35b /drivers/video/backlight/qcom-wled.c | |
parent | af32f3a414d340b0ab92e88ffb80a19632ff345e (diff) | |
parent | 7af43a76695db71a57203793fb9dd3c81a5783b1 (diff) |
Merge tag 'backlight-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"Fix-ups:
- Remove superfluous code in ams369fg06
- Convert over to GPIO descriptor (gpiod) in bd6107
Bug Fixes:
- Fix unsigned comparison to less than zero in qcom-wled"
* tag 'backlight-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: qcom-wled: Fix unsigned comparison to zero
backlight: bd6107: Convert to use GPIO descriptor
backlight: ams369fg06: Drop GPIO include
Diffstat (limited to 'drivers/video/backlight/qcom-wled.c')
-rw-r--r-- | drivers/video/backlight/qcom-wled.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index d46052d8ff41..3d276b30a78c 100644 --- a/drivers/video/backlight/qcom-wled.c +++ b/drivers/video/backlight/qcom-wled.c @@ -956,8 +956,8 @@ static int wled_configure(struct wled *wled, int version) struct wled_config *cfg = &wled->cfg; struct device *dev = wled->dev; const __be32 *prop_addr; - u32 size, val, c, string_len; - int rc, i, j; + u32 size, val, c; + int rc, i, j, string_len; const struct wled_u32_opts *u32_opts = NULL; const struct wled_u32_opts wled3_opts[] = { |