From: Fabio Estevam Date: Fri, 6 Jul 2012 18:26:37 +0000 (-0700) Subject: Input: imx_keypad - adapt the new kpp clock name X-Git-Tag: MMI-PSA29.97-13-9~4395^2~1286 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a40ec72d540553fc0e1d1fea94c1d7629b7f35f4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Input: imx_keypad - adapt the new kpp clock name With the new i.mx clock framework we should pass NULL as the keypad clock name. Signed-off-by: Fabio Estevam Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 9d57945db53d..4830615ed2ec 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -467,7 +467,7 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev) goto failed_free_priv; } - keypad->clk = clk_get(&pdev->dev, "kpp"); + keypad->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(keypad->clk)) { dev_err(&pdev->dev, "failed to get keypad clock\n"); error = PTR_ERR(keypad->clk);