diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-01-17 23:40:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-17 23:49:02 -0500 |
| commit | a0640925880a5801ae0aac232fae6900a2c44b27 (patch) | |
| tree | c89dd02d1b9af89c53e3bdb30f30b95740a7cf0c | |
| parent | 01c728a246a1072fe9664b91179a47937182b0a0 (diff) | |
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>
| -rw-r--r-- | drivers/input/keyboard/tnetv107x-keypad.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c index b4a81ebfab9..c8f097a15d8 100644 --- a/drivers/input/keyboard/tnetv107x-keypad.c +++ b/drivers/input/keyboard/tnetv107x-keypad.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/err.h> | ||
| 17 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 18 | #include <linux/input.h> | 19 | #include <linux/input.h> |
| 19 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| @@ -219,9 +220,9 @@ static int __devinit keypad_probe(struct platform_device *pdev) | |||
| 219 | } | 220 | } |
| 220 | 221 | ||
| 221 | kp->clk = clk_get(dev, NULL); | 222 | kp->clk = clk_get(dev, NULL); |
| 222 | if (!kp->clk) { | 223 | if (IS_ERR(kp->clk)) { |
| 223 | dev_err(dev, "cannot claim device clock\n"); | 224 | dev_err(dev, "cannot claim device clock\n"); |
| 224 | error = -EINVAL; | 225 | error = PTR_ERR(kp->clk); |
| 225 | goto error_clk; | 226 | goto error_clk; |
| 226 | } | 227 | } |
| 227 | 228 | ||
