Commit 76cc4386 authored Nov 01, 2012 by Wei Yongjun Committed by Greg Kroah-Hartman Nov 01, 2012

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>

parent 31fe9904

drivers/tty/serial/of_serial.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message