Skip to content

Commit

Permalink
Input: elants_i2c - Fix NULL dereference at probing
Browse files Browse the repository at this point in the history
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: 9517b95 ("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>
  • Loading branch information
tiwai authored and intel-lab-lkp committed May 27, 2021
1 parent 6cf3b3a commit 8a6af62
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/input/touchscreen/elants_i2c.c
Expand Up @@ -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)device_get_match_data(&client->dev);
i2c_set_clientdata(client, ts);

ts->vcc33 = devm_regulator_get(&client->dev, "vcc33");
Expand Down Expand Up @@ -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 = EKTH3500 },
{ .compatible = "elan,ektf3624", .data = EKTF3624 },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, elants_of_match);
Expand Down

0 comments on commit 8a6af62

Please sign in to comment.