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/s3c2410_ts.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/s3c2410_ts.c')
-rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index a4a103e1d11b..41d58e88cc8a 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -250,7 +250,7 @@ static int s3c2410ts_probe(struct platform_device *pdev) ts.dev = dev; - info = dev_get_platdata(&pdev->dev); + info = dev_get_platdata(dev); if (!info) { dev_err(dev, "no platform data, cannot attach\n"); return -EINVAL; |