Skip to content

Commit

Permalink
tty: of_serial: fix return value check in of_platform_serial_setup()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Yongjun authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent 31fe990 commit 76cc438
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/tty/serial/of_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 76cc438

Please sign in to comment.