diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-19 09:51:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-19 09:51:11 -0800 |
| commit | 632f8577d694efa4f2968be32c44e79f7e2ed2cd (patch) | |
| tree | 8ef8dc992a7c9d25e2045fc8fb3ece0b573e1800 /drivers/input/serio | |
| parent | 1eab0e42450c6038e2bb17da438370fe639973f3 (diff) | |
| parent | 478e5ed1c3f6928ece7fffd712ba728b1f92217d (diff) | |
| download | blackbird-op-linux-632f8577d694efa4f2968be32c44e79f7e2ed2cd.tar.gz blackbird-op-linux-632f8577d694efa4f2968be32c44e79f7e2ed2cd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a few assorted driver fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elants_i2c - fix wake-on-touch
Input: elan_i2c - set input device's vendor and product IDs
Input: sun4i-lradc-keys - fix typo in binding documentation
Input: atmel_mxt_ts - add maxtouch to I2C table for module autoload
Input: arizona-haptic - fix disabling of haptics device
Input: aiptek - fix crash on detecting device without endpoints
Input: atmel_mxt_ts - add generic platform data for Chromebooks
Input: parkbd - clear unused function pointers
Input: walkera0701 - clear unused function pointers
Input: turbografx - clear unused function pointers
Input: gamecon - clear unused function pointers
Input: db9 - clear unused function pointers
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/parkbd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c index 92c31b8f8fb4..1edfac78d4ac 100644 --- a/drivers/input/serio/parkbd.c +++ b/drivers/input/serio/parkbd.c @@ -145,6 +145,7 @@ static int parkbd_getport(struct parport *pp) { struct pardev_cb parkbd_parport_cb; + memset(&parkbd_parport_cb, 0, sizeof(parkbd_parport_cb)); parkbd_parport_cb.irq_func = parkbd_interrupt; parkbd_parport_cb.flags = PARPORT_FLAG_EXCL; |
