diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 12:49:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 12:49:07 -0700 |
| commit | 4abb663b641ee21024906dae45af7de50ebad2d8 (patch) | |
| tree | 4c12141a8abd046dde464f50aa837eb9ae854918 /drivers/input/misc | |
| parent | 5ba7026b4467b55fedddf73d093ef3322e8e5b52 (diff) | |
| parent | 0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Just a few small fixes..."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: da9052 - fix memory leak in da9052_onkey_probe()
Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h
Input: trackpoint - use psmouse_fmt() for messages
Input: elantech - v4 is a clickpad, with only one button
Input: elantech - reset touchpad before configuring it
Input: sentelic - filter taps in absolute mode
Input: tps6507x-ts - fix MODULE_ALIAS to match driver name
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/da9052_onkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c index 34aebb8cd080..3c843cd725fa 100644 --- a/drivers/input/misc/da9052_onkey.c +++ b/drivers/input/misc/da9052_onkey.c @@ -95,7 +95,8 @@ static int __devinit da9052_onkey_probe(struct platform_device *pdev) input_dev = input_allocate_device(); if (!onkey || !input_dev) { dev_err(&pdev->dev, "Failed to allocate memory\n"); - return -ENOMEM; + error = -ENOMEM; + goto err_free_mem; } onkey->input = input_dev; |