Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: elants_i2c - fix NULL dereference at probing

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
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210528071024.26450-1-tiwai@suse.de
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Takashi Iwai and committed by
Dmitry Torokhov
b9c0ebb8 0b1d6c8c

+3 -3
+3 -3
drivers/input/touchscreen/elants_i2c.c
··· 1396 1396 init_completion(&ts->cmd_done); 1397 1397 1398 1398 ts->client = client; 1399 - ts->chip_id = (enum elants_chip_id)id->driver_data; 1399 + ts->chip_id = (enum elants_chip_id)(uintptr_t)device_get_match_data(&client->dev); 1400 1400 i2c_set_clientdata(client, ts); 1401 1401 1402 1402 ts->vcc33 = devm_regulator_get(&client->dev, "vcc33"); ··· 1636 1636 1637 1637 #ifdef CONFIG_OF 1638 1638 static const struct of_device_id elants_of_match[] = { 1639 - { .compatible = "elan,ekth3500" }, 1640 - { .compatible = "elan,ektf3624" }, 1639 + { .compatible = "elan,ekth3500", .data = (void *)EKTH3500 }, 1640 + { .compatible = "elan,ektf3624", .data = (void *)EKTF3624 }, 1641 1641 { /* sentinel */ } 1642 1642 }; 1643 1643 MODULE_DEVICE_TABLE(of, elants_of_match);