| Message ID | 20221130210202.2069213-1-vincent.knecht@mailoo.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a5df8025f37a813f3f512ea3048ca505561b9c27 |
| Headers | show |
| Series | [RESEND] Input: msg2638 - only read linux,keycodes array if necessary | expand |
On Wed, Nov 30, 2022 at 10:01:59PM +0100, Vincent Knecht wrote: > The linux,keycodes property is optional. > Fix the driver not probing when it's not specified. > > Fixes: c18ef50346f2 ("Input: msg2638 - add support for msg2138 key events") > Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org> Applied, thank you.
diff --git a/drivers/input/touchscreen/msg2638.c b/drivers/input/touchscreen/msg2638.c index 51b1c0e8a761..4c0816b09d33 100644 --- a/drivers/input/touchscreen/msg2638.c +++ b/drivers/input/touchscreen/msg2638.c @@ -412,13 +412,15 @@ static int msg2638_ts_probe(struct i2c_client *client) msg2638->num_keycodes = ARRAY_SIZE(msg2638->keycodes); } - error = device_property_read_u32_array(dev, "linux,keycodes", - msg2638->keycodes, - msg2638->num_keycodes); - if (error) { - dev_err(dev, "Unable to read linux,keycodes values: %d\n", - error); - return error; + if (msg2638->num_keycodes > 0) { + error = device_property_read_u32_array(dev, "linux,keycodes", + msg2638->keycodes, + msg2638->num_keycodes); + if (error) { + dev_err(dev, "Unable to read linux,keycodes values: %d\n", + error); + return error; + } } error = devm_request_threaded_irq(dev, client->irq,
The linux,keycodes property is optional. Fix the driver not probing when it's not specified. Fixes: c18ef50346f2 ("Input: msg2638 - add support for msg2138 key events") Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org> --- Resending because of mailing issue, ie. not appearing on mailing lists. --- drivers/input/touchscreen/msg2638.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)