summaryrefslogtreecommitdiff
path: root/drivers/input/misc/gpio_decoder.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-02-20 15:16:02 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-02-20 15:16:02 -0800
commit6e11617fcff3688f70650a3e40addb0043dda137 (patch)
treea24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /drivers/input/misc/gpio_decoder.c
parent722c5ac708b4f5c1fcfad5fed4c95234c8b06590 (diff)
parenta1b5359271e5c77d5ec8a575b379a6ba3e867097 (diff)
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;
}