summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/gpio_decoder.c
diff options
context:
space:
mode:
authorDmitry Torokhov2017-02-21 00:16:02 +0100
committerDmitry Torokhov2017-02-21 00:16:02 +0100
commit6e11617fcff3688f70650a3e40addb0043dda137 (patch)
treea24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /drivers/input/misc/gpio_decoder.c
parentInput: elan_i2c - add ELAN0605 to the ACPI table (diff)
parentInput: zet6223 - export OF device ID as module aliases (diff)
downloadkernel-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/misc/gpio_decoder.c')
-rw-r--r--drivers/input/misc/gpio_decoder.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/gpio_decoder.c b/drivers/input/misc/gpio_decoder.c
index ca7e0bacb2d8..1dca526e6f1a 100644
--- a/drivers/input/misc/gpio_decoder.c
+++ b/drivers/input/misc/gpio_decoder.c
@@ -110,7 +110,6 @@ static int gpio_decoder_probe(struct platform_device *pdev)
dev_err(dev, "failed to register polled device\n");
return err;
}
- platform_set_drvdata(pdev, decoder);
return 0;
}