github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 20:14:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Input: cyttsp - use guard notation when acquiring mutex

Browse Source 
Guard notation simplifies code.

Also fix the touchscreen not being marked as suspended when noone has
opened/is using it.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2024-08-17 17:14:57 -07:00
parent 37115e7df5
commit a0a92414af
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/input/touchscreen/cyttsp_core.c
View File

@ -494,34 +494,30 @@ static int cyttsp_disable(struct cyttsp *ts)
static int cyttsp_suspend(struct device *dev)
{
struct cyttsp *ts = dev_get_drvdata(dev);
int retval = 0;
int error;
mutex_lock(&ts->input->mutex);
guard(mutex)(&ts->input->mutex);
if (input_device_enabled(ts->input)) {
retval = cyttsp_disable(ts);
if (retval == 0)
ts->suspended = true;
error = cyttsp_disable(ts);
if (error)
return error;
}
mutex_unlock(&ts->input->mutex);
return retval;
ts->suspended = true;
return 0;
}
static int cyttsp_resume(struct device *dev)
{
struct cyttsp *ts = dev_get_drvdata(dev);
mutex_lock(&ts->input->mutex);
guard(mutex)(&ts->input->mutex);
if (input_device_enabled(ts->input))
cyttsp_enable(ts);
ts->suspended = false;
mutex_unlock(&ts->input->mutex);
return 0;
}