* [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup()
@ 2012-11-01 5:27 Wei Yongjun
2012-11-01 14:00 ` Murali Karicheri
2012-11-15 12:08 ` Grant Likely
0 siblings, 2 replies; 6+ messages in thread
From: Wei Yongjun @ 2012-11-01 5:27 UTC (permalink / raw)
To: alan, gregkh, grant.likely, rob.herring, seth.heasley
Cc: yongjun_wei, linux-serial, devicetree-discuss
From: Wei Yongjun <yongjun_wei@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@trendmicro.com.cn>
---
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);
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup()
2012-11-01 5:27 [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup() Wei Yongjun
@ 2012-11-01 14:00 ` Murali Karicheri
2012-11-01 14:48 ` Alan Cox
2012-11-15 12:08 ` Grant Likely
1 sibling, 1 reply; 6+ messages in thread
From: Murali Karicheri @ 2012-11-01 14:00 UTC (permalink / raw)
To: Wei Yongjun
Cc: alan, gregkh, grant.likely, rob.herring, seth.heasley,
yongjun_wei, linux-serial, devicetree-discuss
On 11/01/2012 01:27 AM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@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@trendmicro.com.cn>
> ---
> 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);
I think this is wrong. it should return -ENODEV;
Murali
> }
>
> clk_prepare_enable(info->clk);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-serial" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup()
2012-11-01 14:00 ` Murali Karicheri
@ 2012-11-01 14:48 ` Alan Cox
0 siblings, 0 replies; 6+ messages in thread
From: Alan Cox @ 2012-11-01 14:48 UTC (permalink / raw)
To: Murali Karicheri
Cc: Wei Yongjun, gregkh, grant.likely, rob.herring, seth.heasley,
yongjun_wei, linux-serial, devicetree-discuss
> > "clk or clock-frequency not
> > defined\n");
> > - return -ENODEV;
> > + return PTR_ERR(info->clk);
> I think this is wrong. it should return -ENODEV;
Returning the clock error at least ensures the real reason for the fail
is reported. I think its better to use the PTR_ERR but I'd not class
either as wrong.
Alan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup()
2012-11-01 5:27 [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup() Wei Yongjun
2012-11-01 14:00 ` Murali Karicheri
@ 2012-11-15 12:08 ` Grant Likely
2012-11-16 1:22 ` Greg KH
2012-11-16 2:21 ` Wei Yongjun
1 sibling, 2 replies; 6+ messages in thread
From: Grant Likely @ 2012-11-15 12:08 UTC (permalink / raw)
To: Wei Yongjun, alan, gregkh, rob.herring, seth.heasley, stable
Cc: yongjun_wei, linux-serial, devicetree-discuss
On Thu, 1 Nov 2012 13:27:34 +0800, Wei Yongjun <weiyj.lk@gmail.com> wrote:
> From: Wei Yongjun <yongjun_wei@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@trendmicro.com.cn>
Looks correct to me.
Acked-by: Grant Likely <grant.likely@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.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup()
2012-11-15 12:08 ` Grant Likely
@ 2012-11-16 1:22 ` Greg KH
2012-11-16 2:21 ` Wei Yongjun
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2012-11-16 1:22 UTC (permalink / raw)
To: Grant Likely
Cc: Wei Yongjun, alan, rob.herring, seth.heasley, stable,
yongjun_wei, linux-serial, devicetree-discuss
On Thu, Nov 15, 2012 at 12:08:11PM +0000, Grant Likely wrote:
> On Thu, 1 Nov 2012 13:27:34 +0800, Wei Yongjun <weiyj.lk@gmail.com> wrote:
> > From: Wei Yongjun <yongjun_wei@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@trendmicro.com.cn>
>
> Looks correct to me.
>
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
>
> Alan, which tree should this go through?
My tty tree, I'll take it.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup()
2012-11-15 12:08 ` Grant Likely
2012-11-16 1:22 ` Greg KH
@ 2012-11-16 2:21 ` Wei Yongjun
1 sibling, 0 replies; 6+ messages in thread
From: Wei Yongjun @ 2012-11-16 2:21 UTC (permalink / raw)
To: grant.likely
Cc: alan, gregkh, rob.herring, seth.heasley, stable, yongjun_wei,
linux-serial, devicetree-discuss
On 11/15/2012 08:08 PM, Grant Likely wrote:
> On Thu, 1 Nov 2012 13:27:34 +0800, Wei Yongjun <weiyj.lk@gmail.com> wrote:
>> From: Wei Yongjun <yongjun_wei@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@trendmicro.com.cn>
> Looks correct to me.
>
> Acked-by: Grant Likely <grant.likely@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.
Hi,
this only happens in the -next tree, so I think no need for stable.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-11-16 2:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-01 5:27 [PATCH -next] tty: of_serial: fix return value check in of_platform_serial_setup() Wei Yongjun
2012-11-01 14:00 ` Murali Karicheri
2012-11-01 14:48 ` Alan Cox
2012-11-15 12:08 ` Grant Likely
2012-11-16 1:22 ` Greg KH
2012-11-16 2:21 ` Wei Yongjun
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.