From: Vipul Kumar Samar <[email protected]> clk_{un}prepare is mandatory for platforms using common clock framework. Because for SPEAr we don't do anything in clk_{un}prepare() calls, just call them ones in probe/remove.
Signed-off-by: Vipul Kumar Samar <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> --- drivers/input/keyboard/spear-keyboard.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c index 1d24fb2..9792924 100644 --- a/drivers/input/keyboard/spear-keyboard.c +++ b/drivers/input/keyboard/spear-keyboard.c @@ -245,6 +245,10 @@ static int __devinit spear_kbd_probe(struct platform_device *pdev) goto err_free_mem; } + error = clk_prepare(kbd->clk); + if (error) + goto err_free_mem; + input_dev->name = "Spear Keyboard"; input_dev->phys = "keyboard/input0"; input_dev->dev.parent = &pdev->dev; @@ -259,7 +263,7 @@ static int __devinit spear_kbd_probe(struct platform_device *pdev) kbd->keycodes, input_dev); if (error) { dev_err(&pdev->dev, "Failed to build keymap\n"); - goto err_free_mem; + goto err_unprepare_clk; } if (kbd->rep) @@ -272,13 +276,13 @@ static int __devinit spear_kbd_probe(struct platform_device *pdev) "keyboard", kbd); if (error) { dev_err(&pdev->dev, "request_irq fail\n"); - goto err_free_mem; + goto err_unprepare_clk; } error = input_register_device(input_dev); if (error) { dev_err(&pdev->dev, "Unable to register keyboard device\n"); - goto err_free_mem; + goto err_unprepare_clk; } device_init_wakeup(&pdev->dev, 1); @@ -286,6 +290,8 @@ static int __devinit spear_kbd_probe(struct platform_device *pdev) return 0; +err_unprepare_clk: + clk_unprepare(kbd->clk); err_free_mem: input_free_device(input_dev); @@ -297,6 +303,7 @@ static int __devexit 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); -- 1.7.12.rc2.18.g61b472e -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
