raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Input: cap11xx - switch to using set_brightness_blocking()

Browse Source 
[ Upstream commit 628442880a ]

Updating LED state requires access to regmap and therefore we may sleep,
so we could not do that directly form set_brightness() method.
Historically we used private work to adjust the brightness, but with the
introduction of set_brightness_blocking() we no longer need it.

As a bonus, not having our own work item means we do not have
use-after-free issue as we neglected to cancel outstanding work on
driver unbind.

Reported-by: Sven Van Asbroeck <thesven73@gmail.com>
Reviewed-by: Sven Van Asbroeck <TheSven73@googlemail.com>
Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dmitry Torokhov
2019-02-05 13:52:26 -08:00
committed by Greg Kroah-Hartman
parent f49f7007de
commit 4fe714b750
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/input/keyboard/cap11xx.c
View File

@@ -75,9 +75,7 @@
struct cap11xx_led { struct cap11xx_led {
struct cap11xx_priv *priv; struct cap11xx_priv *priv;
struct led_classdev cdev; struct led_classdev cdev;
struct work_struct work;
u32 reg; u32 reg;
enum led_brightness new_brightness;
}; };
#endif #endif
@@ -233,30 +231,21 @@ static void cap11xx_input_close(struct input_dev *idev)
} }
#ifdef CONFIG_LEDS_CLASS #ifdef CONFIG_LEDS_CLASS
static void cap11xx_led_work(struct work_struct *work) static int cap11xx_led_set(struct led_classdev *cdev,
{
struct cap11xx_led *led = container_of(work, struct cap11xx_led, work);
struct cap11xx_priv *priv = led->priv;
int value = led->new_brightness;
/*
* All LEDs share the same duty cycle as this is a HW limitation.
* Brightness levels per LED are either 0 (OFF) and 1 (ON).
*/
regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
BIT(led->reg), value ? BIT(led->reg) : 0);
}
static void cap11xx_led_set(struct led_classdev *cdev,
enum led_brightness value) enum led_brightness value)
{ {
struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev); struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev);
struct cap11xx_priv *priv = led->priv;
if (led->new_brightness == value) /*
return; * All LEDs share the same duty cycle as this is a HW
* limitation. Brightness levels per LED are either
led->new_brightness = value; * 0 (OFF) and 1 (ON).
schedule_work(&led->work); */
return regmap_update_bits(priv->regmap,
CAP11XX_REG_LED_OUTPUT_CONTROL,
BIT(led->reg),
value ? BIT(led->reg) : 0);
} }
static int cap11xx_init_leds(struct device *dev, static int cap11xx_init_leds(struct device *dev,
@@ -299,7 +288,7 @@ static int cap11xx_init_leds(struct device *dev,
led->cdev.default_trigger = led->cdev.default_trigger =
of_get_property(child, "linux,default-trigger", NULL); of_get_property(child, "linux,default-trigger", NULL);
led->cdev.flags = 0; led->cdev.flags = 0;
led->cdev.brightness_set = cap11xx_led_set; led->cdev.brightness_set_blocking = cap11xx_led_set;
led->cdev.max_brightness = 1; led->cdev.max_brightness = 1;
led->cdev.brightness = LED_OFF; led->cdev.brightness = LED_OFF;
@@ -312,8 +301,6 @@ static int cap11xx_init_leds(struct device *dev,
led->reg = reg; led->reg = reg;
led->priv = priv; led->priv = priv;
INIT_WORK(&led->work, cap11xx_led_work);
error = devm_led_classdev_register(dev, &led->cdev); error = devm_led_classdev_register(dev, &led->cdev);
if (error) { if (error) {
of_node_put(child); of_node_put(child);