projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...
[cascardo/linux.git]
/
drivers
/
input
/
misc
/
da9052_onkey.c
diff --git
a/drivers/input/misc/da9052_onkey.c
b/drivers/input/misc/da9052_onkey.c
index
34aebb8
..
3c843cd
100644
(file)
--- 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;