diff options
author | Dmitry Torokhov | 2017-02-21 00:16:02 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2017-02-21 00:16:02 +0100 |
commit | 6e11617fcff3688f70650a3e40addb0043dda137 (patch) | |
tree | a24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /drivers/input/touchscreen/sx8654.c | |
parent | Input: elan_i2c - add ELAN0605 to the ACPI table (diff) | |
parent | Input: zet6223 - export OF device ID as module aliases (diff) | |
download | kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.tar.gz kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.tar.xz kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.11 merge window.
Diffstat (limited to 'drivers/input/touchscreen/sx8654.c')
-rw-r--r-- | drivers/input/touchscreen/sx8654.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c index 642f4a53de50..ed29db3ec731 100644 --- a/drivers/input/touchscreen/sx8654.c +++ b/drivers/input/touchscreen/sx8654.c @@ -253,7 +253,6 @@ static int sx8654_probe(struct i2c_client *client, if (error) return error; - i2c_set_clientdata(client, sx8654); return 0; } |