[PATCH] input: auo_pixcir_ts - add missing check for gpio

Subsystems: input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE2039d

2 messages, 2 authors, 2021-01-12 · open the first message on its own page

[PATCH] input: auo_pixcir_ts - add missing check for gpio

From: Radim Pavlik <hidden>
Date: 2021-01-07 09:33:40

The of_get_gpio() may return error, so check it immediately. The old
code might fail with EPROBE_DEFER which was masked by the
folowing gpio_is_valid() and returned EINVAL.

Signed-off-by: Radim Pavlik <redacted>
---
 drivers/input/touchscreen/auo-pixcir-ts.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/input/touchscreen/auo-pixcir-ts.c b/drivers/input/touchscreen/auo-pixcir-ts.c
index c33e63ca6142..8f3cfd743bdd 100644
--- a/drivers/input/touchscreen/auo-pixcir-ts.c
+++ b/drivers/input/touchscreen/auo-pixcir-ts.c

@@ -479,12 +479,16 @@ static struct auo_pixcir_ts_platdata *auo_pixcir_parse_dt(struct device *dev)
 		return ERR_PTR(-ENOMEM);
 
 	pdata->gpio_int = of_get_gpio(np, 0);
+	if (pdata->gpio_int < 0)
+		return ERR_PTR(pdata->gpio_int);
 	if (!gpio_is_valid(pdata->gpio_int)) {
 		dev_err(dev, "failed to get interrupt gpio\n");
 		return ERR_PTR(-EINVAL);
 	}
 
 	pdata->gpio_rst = of_get_gpio(np, 1);
+	if (pdata->gpio_rst < 0)
+		return ERR_PTR(pdata->gpio_rst);
 	if (!gpio_is_valid(pdata->gpio_rst)) {
 		dev_err(dev, "failed to get reset gpio\n");
 		return ERR_PTR(-EINVAL);

-- 
2.29.2

Re: [PATCH] input: auo_pixcir_ts - add missing check for gpio

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2021-01-12 05:09:07

Hi Radim,

On Thu, Jan 07, 2021 at 10:32:17AM +0100, Radim Pavlik wrote:

quoted hunk

The of_get_gpio() may return error, so check it immediately. The old
code might fail with EPROBE_DEFER which was masked by the
folowing gpio_is_valid() and returned EINVAL.

Signed-off-by: Radim Pavlik <redacted>
---
 drivers/input/touchscreen/auo-pixcir-ts.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/input/touchscreen/auo-pixcir-ts.c b/drivers/input/touchscreen/auo-pixcir-ts.c
index c33e63ca6142..8f3cfd743bdd 100644
--- a/drivers/input/touchscreen/auo-pixcir-ts.c
+++ b/drivers/input/touchscreen/auo-pixcir-ts.c

@@ -479,12 +479,16 @@ static struct auo_pixcir_ts_platdata *auo_pixcir_parse_dt(struct device *dev)
 		return ERR_PTR(-ENOMEM);
 
 	pdata->gpio_int = of_get_gpio(np, 0);
+	if (pdata->gpio_int < 0)
+		return ERR_PTR(pdata->gpio_int);

Hmm, while this check might make sense it definitely renders the next
one unnecessary.

BTW, do you have a device that uses this touch panel? This driver could
use more improvements, such as switching to gpiod API and generic device
properties, and dropping the platform data support.

Thanks.

-- 
Dmitry

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help