Merge tag 'v4.10-rc5' into next

[muen/linux.git] / drivers / input / touchscreen / elants_i2c.c

diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 3e6003d32e565c748a43730574b9424eeb294d33..872750eeca9325cbb3a9140b0686da4a2f5cbdfa 100644 (file)
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1260,8 +1260,6 @@ static int elants_i2c_probe(struct i2c_client *client,
        input_abs_set_res(ts->input, ABS_MT_POSITION_X, ts->x_res);
        input_abs_set_res(ts->input, ABS_MT_POSITION_Y, ts->y_res);
 
-       input_set_drvdata(ts->input, ts);
-
        error = input_register_device(ts->input);
        if (error) {
                dev_err(&client->dev,