lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 039/800] Input: elants_i2c - fix NULL dereference at probing
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit b9c0ebb867d67cc4e9e1a7a2abf0ac9a2cc02051 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/input/touchscreen/elants_i2c.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- 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_c
    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);

    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:2.662 / U:0.804 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site