[PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup()

[Grant Likely]

On Thu, 1 Nov 2012 13:27:34 +0800, Wei Yongjun <weiyj.lk at gmail.com> wrote:
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> 
> 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 at trendmicro.com.cn>

Looks correct to me.

Acked-by: Grant Likely <grant.likely at secretlab.ca>

Alan, which tree should this go through?

Wei, did you run into this causing a bug? Do you think it should go back
into linux-stable? It looks like it should to me.

g.

> ---
>  drivers/tty/serial/of_serial.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
> index 533ccfe..b9fdccb 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);
> 
> 

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.