mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Merge tag 'backlight-next-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"Improvements & Fixes:
- Qualcomm WLED: Fix a NULL pointer dereference in `wled_remove()` by
setting platform driver data in `wled_probe()`
- Qualcomm WLED: Fix the WLED3 brightness register stride to prevent
consecutive string writes from overlapping
- Qualcomm WLED: Read back the hardware-programmed brightness at
probe, expose it via
`get_brightness()`, and prevent unbalanced OVP IRQ enabling
- TI LM3630A: Cancel delayed work synchronously after freeing the IRQ
and before destroying the workqueue in `lm3630a_remove()`
Cleanups & Refactoring:
- Ilitek ILI9320 / Kinetic KTD253: Fix spelling typos in comments"
* tag 'backlight-next-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: qcom-wled: Read back the programmed brightness at probe
backlight: qcom-wled: Fix unbalanced OVP IRQ enable at probe
backlight: qcom-wled: Fix WLED3 brightness register stride
backlight: qcom-wled: Fix NULL pointer dereference in wled_remove()
backlight: lm3630a: Cancel delayed work before destroying workqueue
backlight: ili9320/ktd253: Fix typos in comments
This commit is contained in:
@@ -30,7 +30,7 @@ static inline int ili9320_write_spi(struct ili9320 *ili,
|
||||
unsigned char *addr = spi->buffer_addr;
|
||||
unsigned char *data = spi->buffer_data;
|
||||
|
||||
/* spi message consits of:
|
||||
/* spi message consists of:
|
||||
* first byte: ID and operation
|
||||
*/
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ static int ktd253_backlight_stepdown(struct ktd253_backlight *ktd253)
|
||||
*
|
||||
* Architectures do not always support ndelay() and we will get a few us
|
||||
* instead. If we get to a critical time limit an interrupt has likely
|
||||
* occured in the low part of the loop and we need to restart from the
|
||||
* occurred in the low part of the loop and we need to restart from the
|
||||
* top so we have the backlight in a known state.
|
||||
*/
|
||||
u64 ns;
|
||||
|
||||
@@ -591,6 +591,7 @@ static void lm3630a_remove(struct i2c_client *client)
|
||||
|
||||
if (pchip->irq) {
|
||||
free_irq(pchip->irq, pchip);
|
||||
cancel_delayed_work_sync(&pchip->work);
|
||||
destroy_workqueue(pchip->irqthread);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user