tty: of_serial: fix return value check in of_platform_serial_setup()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Thu, 1 Nov 2012 05:27:34 +0000 (13:27 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Nov 2012 15:50:01 +0000 (08:50 -0700)
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>
drivers/tty/serial/of_serial.c

index 533ccfe770945581597efd04051672a64fca8491..b9fdccb225904633a2caf28a6bf5bace95228849 100644 (file)
@@ -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);