From 7ef14fa5d2d701747f90cb9b64b02f53329a46ed Mon Sep 17 00:00:00 2001 From: Vipul Kumar Samar Date: Mon, 26 Nov 2012 08:50:08 -0800 Subject: [PATCH] --- yaml --- r: 346960 b: refs/heads/master c: 9336648978c2e9de9bf3c026918db386ace19a86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/spear-keyboard.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 564cad8bab64..b3d60aae1dec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92aab96034c2cdf11eb61a6b14409c2da8e5158d +refs/heads/master: 9336648978c2e9de9bf3c026918db386ace19a86 diff --git a/trunk/drivers/input/keyboard/spear-keyboard.c b/trunk/drivers/input/keyboard/spear-keyboard.c index d70093bef740..695d237417d6 100644 --- a/trunk/drivers/input/keyboard/spear-keyboard.c +++ b/trunk/drivers/input/keyboard/spear-keyboard.c @@ -267,9 +267,14 @@ static int spear_kbd_probe(struct platform_device *pdev) return error; } + error = clk_prepare(kbd->clk); + if (error) + return error; + error = input_register_device(input_dev); if (error) { dev_err(&pdev->dev, "Unable to register keyboard device\n"); + clk_unprepare(kbd->clk); return error; } @@ -281,6 +286,11 @@ static int spear_kbd_probe(struct platform_device *pdev) static int spear_kbd_remove(struct platform_device *pdev) { + struct spear_kbd *kbd = platform_get_drvdata(pdev); + + input_unregister_device(kbd->input); + clk_unprepare(kbd->clk); + device_init_wakeup(&pdev->dev, 0); platform_set_drvdata(pdev, NULL);