diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-11-01 01:27:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-01 11:50:01 -0400 |
commit | 76cc43868c1e9d6344ad6c4992c4f6abd5204a8f (patch) | |
tree | 84f3bfcb952a2cb5bf74f3e9a15963c0637a36c9 /drivers/tty | |
parent | 31fe99048859b13a87f476016e7bb5c2b5220c36 (diff) |
tty: of_serial: fix return value check in of_platform_serial_setup()
In case of error, the function clk_get() returns ERR_PTR()
and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().
dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/of_serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 533ccfe77094..b9fdccb22590 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c | |||
@@ -66,10 +66,10 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev, | |||
66 | 66 | ||
67 | /* Get clk rate through clk driver if present */ | 67 | /* Get clk rate through clk driver if present */ |
68 | info->clk = clk_get(&ofdev->dev, NULL); | 68 | info->clk = clk_get(&ofdev->dev, NULL); |
69 | if (info->clk == NULL) { | 69 | if (IS_ERR(info->clk)) { |
70 | dev_warn(&ofdev->dev, | 70 | dev_warn(&ofdev->dev, |
71 | "clk or clock-frequency not defined\n"); | 71 | "clk or clock-frequency not defined\n"); |
72 | return -ENODEV; | 72 | return PTR_ERR(info->clk); |
73 | } | 73 | } |
74 | 74 | ||
75 | clk_prepare_enable(info->clk); | 75 | clk_prepare_enable(info->clk); |