diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 18:53:34 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 18:53:34 -0400 |
| commit | 163ec0369be4c26e68385f6cec88d0ee38c8d8e5 (patch) | |
| tree | f3e441866f8bc1b0548e7d8eddd9548b6aedef5e /drivers/input/misc/da9052_onkey.c | |
| parent | 199642bfe107c411f25fbfc16c9fd49cfef9785d (diff) | |
| parent | 99dbdd98f271899e023d52b3f4c2bf67cdd7eb56 (diff) | |
Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
Diffstat (limited to 'drivers/input/misc/da9052_onkey.c')
| -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) | |||
| 95 | input_dev = input_allocate_device(); | 95 | input_dev = input_allocate_device(); |
| 96 | if (!onkey || !input_dev) { | 96 | if (!onkey || !input_dev) { |
| 97 | dev_err(&pdev->dev, "Failed to allocate memory\n"); | 97 | dev_err(&pdev->dev, "Failed to allocate memory\n"); |
| 98 | return -ENOMEM; | 98 | error = -ENOMEM; |
| 99 | goto err_free_mem; | ||
| 99 | } | 100 | } |
| 100 | 101 | ||
| 101 | onkey->input = input_dev; | 102 | onkey->input = input_dev; |