| Message ID | 20210528071024.26450-2-tiwai@suse.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 45a4b68354ffccbc9ca71027bd34754ca24f5183 |
| Headers | show |
| Series | [v3,1/2] Input: elants_i2c - Fix NULL dereference at probing | expand |
On Fri, May 28, 2021 at 09:10:24AM +0200, Takashi Iwai wrote: > Now that we get rid of the usage of id argument at probe again, let's > switch to the new i2c probe method; this will avoid for people > misusing the possibly unassigned id pointer again. > > 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 0f9e3ec99aae..68f542bb809f 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -1369,8 +1369,7 @@ static bool elants_acpi_is_hid_device(struct device *dev) } #endif -static int elants_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int elants_i2c_probe(struct i2c_client *client) { union i2c_smbus_data dummy; struct elants_data *ts; @@ -1644,7 +1643,7 @@ MODULE_DEVICE_TABLE(of, elants_of_match); #endif static struct i2c_driver elants_i2c_driver = { - .probe = elants_i2c_probe, + .probe_new = elants_i2c_probe, .id_table = elants_i2c_id, .driver = { .name = DEVICE_NAME,
Now that we get rid of the usage of id argument at probe again, let's switch to the new i2c probe method; this will avoid for people misusing the possibly unassigned id pointer again. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/input/touchscreen/elants_i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)