| Message ID | 20210528071024.26450-1-tiwai@suse.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b9c0ebb867d67cc4e9e1a7a2abf0ac9a2cc02051 |
| Headers | show |
| Series | [v3,1/2] Input: elants_i2c - Fix NULL dereference at probing | expand |
On Fri, May 28, 2021 at 09:10:23AM +0200, Takashi Iwai wrote: > The recent change in elants_i2c driver to support more chips > introduced a regression leading to Oops at probing. The driver reads > id->driver_data, but the id may be NULL depending on the device type > the driver gets bound. > > Replace the driver data extraction with the device_get_match_data() > helper, and define the driver data in OF table, too. > > Fixes: 9517b95bdc46 ("Input: elants_i2c - add support for eKTF3624") > BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1186454 > Cc: <stable@vger.kernel.org> > Signed-off-by: Takashi Iwai <tiwai@suse.de> Applied, thank you.
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index 17540bdb1eaf..0f9e3ec99aae 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -1396,7 +1396,7 @@ static int elants_i2c_probe(struct i2c_client *client, init_completion(&ts->cmd_done); ts->client = client; - ts->chip_id = (enum elants_chip_id)id->driver_data; + ts->chip_id = (enum elants_chip_id)(uintptr_t)device_get_match_data(&client->dev); i2c_set_clientdata(client, ts); ts->vcc33 = devm_regulator_get(&client->dev, "vcc33"); @@ -1636,8 +1636,8 @@ MODULE_DEVICE_TABLE(acpi, elants_acpi_id); #ifdef CONFIG_OF static const struct of_device_id elants_of_match[] = { - { .compatible = "elan,ekth3500" }, - { .compatible = "elan,ektf3624" }, + { .compatible = "elan,ekth3500", .data = (void *)EKTH3500 }, + { .compatible = "elan,ektf3624", .data = (void *)EKTF3624 }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, elants_of_match);
The recent change in elants_i2c driver to support more chips introduced a regression leading to Oops at probing. The driver reads id->driver_data, but the id may be NULL depending on the device type the driver gets bound. Replace the driver data extraction with the device_get_match_data() helper, and define the driver data in OF table, too. Fixes: 9517b95bdc46 ("Input: elants_i2c - add support for eKTF3624") BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1186454 Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- v1->v2: Use device_get_match_data() v2->v3: Fix pointer cast drivers/input/touchscreen/elants_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)