---

yaml --- r: 318285 b: refs/heads/master c: a40ec72 h: refs/heads/master i: 318283: 581eab7 v: v3
git-mirror · Jul 7, 2012 · c5169ce · c5169ce
1 parent e4460a1
commit c5169ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1e636e6d35944a2b970481b78a621774276acfd
+refs/heads/master: a40ec72d540553fc0e1d1fea94c1d7629b7f35f4
diff --git a/trunk/drivers/input/keyboard/imx_keypad.c b/trunk/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);