Input: tnetv107x-keypad - don't treat NULL clk as an error
authorJamie Iles <jamie@jamieiles.com>
Tue, 18 Jan 2011 04:40:32 +0000 (20:40 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 18 Jan 2011 04:49:02 +0000 (20:49 -0800)
We should use IS_ERR() when checking whether clk_get() succeeded or
not since it returns errors by encoding error codes with ERR_PTR().

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/keyboard/tnetv107x-keypad.c

index b4a81eb..c8f097a 100644 (file)
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -219,9 +220,9 @@ static int __devinit keypad_probe(struct platform_device *pdev)
        }
 
        kp->clk = clk_get(dev, NULL);
-       if (!kp->clk) {
+       if (IS_ERR(kp->clk)) {
                dev_err(dev, "cannot claim device clock\n");
-               error = -EINVAL;
+               error = PTR_ERR(kp->clk);
                goto error_clk;
        }