diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-27 09:07:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-27 09:07:03 -0800 |
| commit | 78e372e6509bc2412e86afb11be65185f4c9c568 (patch) | |
| tree | c934afa15bce0bff85240ac48393cf54910c0cd5 /drivers/input/serio | |
| parent | 037222ad3f43a45c3a601dabf893efc9264ff5a0 (diff) | |
| parent | 141e5dcaa7356077028b4cd48ec351a38c70e5e5 (diff) | |
| download | linux-78e372e6509bc2412e86afb11be65185f4c9c568.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A fixup for the input_event fix for y2038 Sparc64, and couple other
minor fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: input_event - fix the CONFIG_SPARC64 mixup
Input: olpc_apsp - assign priv->dev earlier
Input: uinput - fix undefined behavior in uinput_validate_absinfo()
Input: raspberrypi-ts - fix link error
Input: xpad - add support for SteelSeries Stratus Duo
Input: input_event - provide override for sparc64
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/olpc_apsp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c index b36084710f69..bae08226e3d9 100644 --- a/drivers/input/serio/olpc_apsp.c +++ b/drivers/input/serio/olpc_apsp.c @@ -195,6 +195,8 @@ static int olpc_apsp_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; + priv->dev = &pdev->dev; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); priv->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(priv->base)) { @@ -248,7 +250,6 @@ static int olpc_apsp_probe(struct platform_device *pdev) goto err_irq; } - priv->dev = &pdev->dev; device_init_wakeup(priv->dev, 1); platform_set_drvdata(pdev, priv); |