OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: stmfts - acknowledge that setting brightness is a blocking call 

We need to turn regulators on and off when switching brightness, and
that may block, therefore we have to set stmfts_brightness_set() as
LED's brightness_set_blocking() method.

Fixes: 78bcac7b2a ("Input: add support for the STMicroelectronics FingerTip touchscreen")
Acked-by: Andi Shyti <andi@etezian.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2019-02-05 14:40:40 -08:00
parent 576057bf75
commit 937c4e552f
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/input/touchscreen/stmfts.c
View File

@ -106,27 +106,29 @@ struct stmfts_data {
bool running; bool running;
}; };
static void stmfts_brightness_set(struct led_classdev *led_cdev, static int stmfts_brightness_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
struct stmfts_data *sdata = container_of(led_cdev, struct stmfts_data *sdata = container_of(led_cdev,
struct stmfts_data, led_cdev); struct stmfts_data, led_cdev);
int err; int err;
if (value == sdata->led_status || !sdata->ledvdd) if (value != sdata->led_status && sdata->ledvdd) {
return; if (!value) {
regulator_disable(sdata->ledvdd);
if (!value) { } else {
regulator_disable(sdata->ledvdd); err = regulator_enable(sdata->ledvdd);
} else { if (err) {
err = regulator_enable(sdata->ledvdd); dev_warn(&sdata->client->dev,
if (err) "failed to disable ledvdd regulator: %d\n",
dev_warn(&sdata->client->dev, err);
"failed to disable ledvdd regulator: %d\n", return err;
err); }
}
sdata->led_status = value;
} }
sdata->led_status = value; return 0;
} }
static enum led_brightness stmfts_brightness_get(struct led_classdev *led_cdev) static enum led_brightness stmfts_brightness_get(struct led_classdev *led_cdev)
@ -608,7 +610,7 @@ static int stmfts_enable_led(struct stmfts_data *sdata)
sdata->led_cdev.name = STMFTS_DEV_NAME; sdata->led_cdev.name = STMFTS_DEV_NAME;
sdata->led_cdev.max_brightness = LED_ON; sdata->led_cdev.max_brightness = LED_ON;
sdata->led_cdev.brightness = LED_OFF; sdata->led_cdev.brightness = LED_OFF;
sdata->led_cdev.brightness_set = stmfts_brightness_set; sdata->led_cdev.brightness_set_blocking = stmfts_brightness_set;
sdata->led_cdev.brightness_get = stmfts_brightness_get; sdata->led_cdev.brightness_get = stmfts_brightness_get;
err = devm_led_classdev_register(&sdata->client->dev, &sdata->led_cdev); err = devm_led_classdev_register(&sdata->client->dev, &sdata->led_cdev);