summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-18 05:40:32 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-18 05:49:02 +0100
commita0640925880a5801ae0aac232fae6900a2c44b27 (patch)
treec89dd02d1b9af89c53e3bdb30f30b95740a7cf0c /drivers/input
parentMerge branch 'next' into for-linus (diff)
downloadlinux-a0640925880a5801ae0aac232fae6900a2c44b27.tar.xz
linux-a0640925880a5801ae0aac232fae6900a2c44b27.zip
Input: tnetv107x-keypad - don't treat NULL clk as an error
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/tnetv107x-keypad.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c
index b4a81ebfab92..c8f097a15d89 100644
--- a/drivers/input/keyboard/tnetv107x-keypad.c
+++ b/drivers/input/keyboard/tnetv107x-keypad.c
@@ -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;
}