diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-11-01 13:27:34 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-01 08:50:01 -0700 |
| commit | 76cc43868c1e9d6344ad6c4992c4f6abd5204a8f (patch) | |
| tree | 84f3bfcb952a2cb5bf74f3e9a15963c0637a36c9 /drivers/tty/serial/of_serial.c | |
| parent | serial:ifx6x60:Prevent data transfer when IFX6x60 port is shutdown (diff) | |
| download | linux-dev-76cc43868c1e9d6344ad6c4992c4f6abd5204a8f.tar.xz linux-dev-76cc43868c1e9d6344ad6c4992c4f6abd5204a8f.zip | |
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/serial/of_serial.c')
| -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, /* Get clk rate through clk driver if present */ info->clk = clk_get(&ofdev->dev, NULL); - if (info->clk == NULL) { + if (IS_ERR(info->clk)) { dev_warn(&ofdev->dev, "clk or clock-frequency not defined\n"); - return -ENODEV; + return PTR_ERR(info->clk); } clk_prepare_enable(info->clk); |