diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 02:06:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 02:06:13 +0100 |
| commit | e93df634aac6b6dccaa2c23a5a5a504ed502b97e (patch) | |
| tree | 1727618cb4e5c7b70658448e252b4b58b8730dc0 /drivers/input/mouse/alps.c | |
| parent | Merge tag 'regulator-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Input: psmouse - disable "palm detection" in the focaltech driver (diff) | |
| download | linux-e93df634aac6b6dccaa2c23a5a5a504ed502b97e.tar.xz linux-e93df634aac6b6dccaa2c23a5a5a504ed502b97e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Miscellaneous driver fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - disable "palm detection" in the focaltech driver
Input: psmouse - disable changing resolution/rate/scale for FocalTech
Input: psmouse - ensure that focaltech reports consistent coordinates
Input: psmouse - remove hardcoded touchpad size from the focaltech driver
Input: tc3589x-keypad - set IRQF_ONESHOT flag to ensure IRQ request
Input: ALPS - fix memory leak when detection fails
Input: sun4i-ts - add thermal driver dependency
Input: cyapa - remove superfluous type check in cyapa_gen5_read_idac_data()
Input: cyapa - fix unaligned functions redefinition error
Input: mma8450 - add parent device
Diffstat (limited to 'drivers/input/mouse/alps.c')
| -rw-r--r-- | drivers/input/mouse/alps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index d28726a0ef85..1bd15ebc01f2 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -2605,8 +2605,10 @@ int alps_detect(struct psmouse *psmouse, bool set_properties) return -ENOMEM; error = alps_identify(psmouse, priv); - if (error) + if (error) { + kfree(priv); return error; + } if (set_properties) { psmouse->vendor = "ALPS"; |