summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-17 20:40:55 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-17 20:49:07 -0800
commitba555461833aa1b5083004492ba97c92d5fccf46 (patch)
treefb7bc2a0934bb209351f6ddca4046e17f56e5cd2 /drivers
parenta0640925880a5801ae0aac232fae6900a2c44b27 (diff)
downloadtalos-obmc-linux-ba555461833aa1b5083004492ba97c92d5fccf46.tar.gz
talos-obmc-linux-ba555461833aa1b5083004492ba97c92d5fccf46.zip
Input: tnetv107x-ts - 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')
-rw-r--r--drivers/input/touchscreen/tnetv107x-ts.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/tnetv107x-ts.c b/drivers/input/touchscreen/tnetv107x-ts.c
index cf1dba2e267c..22a3411e93c5 100644
--- a/drivers/input/touchscreen/tnetv107x-ts.c
+++ b/drivers/input/touchscreen/tnetv107x-ts.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>
@@ -289,9 +290,9 @@ static int __devinit tsc_probe(struct platform_device *pdev)
}
ts->clk = clk_get(dev, NULL);
- if (!ts->clk) {
+ if (IS_ERR(ts->clk)) {
dev_err(dev, "cannot claim device clock\n");
- error = -EINVAL;
+ error = PTR_ERR(ts->clk);
goto error_clk;
}
OpenPOWER on IntegriCloud