diff options
author | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
commit | ab2965eefef95a2eecfd54c12b0eb243162862e9 (patch) | |
tree | c947fdc158e144c2d060486b65d10ee67d254039 /drivers/input/misc | |
parent | a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595 (diff) | |
parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) |
Merge commit 'v3.4-rc3' into android-3.4
Conflicts:
drivers/staging/android/lowmemorykiller.c
Change-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306
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 34aebb8cd08..3c843cd725f 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; |