2017-06-23 19:44:44

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH v2] thermal: bcm2835: Fix error code in 'bcm2835_thermal_probe'

'tz' is a valid pointer at this point, so calling PTR_ERR on it is
pointless.
This 'err = PTR_ERR(tz)' looks like a cut'n'paste from a few lines above.
So remove it. 'err' is already the error we want to report.

Signed-off-by: Christophe JAILLET <[email protected]>
---
v2: fix empty subject
---
drivers/thermal/broadcom/bcm2835_thermal.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index 0ecf80890c84..e6863c841662 100644
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -245,7 +245,6 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
*/
err = tz->ops->get_trip_temp(tz, 0, &trip_temp);
if (err < 0) {
- err = PTR_ERR(tz);
dev_err(&pdev->dev,
"Not able to read trip_temp: %d\n",
err);
--
2.11.0


2017-06-23 20:26:41

by Stefan Wahren

[permalink] [raw]
Subject: Re: [PATCH v2] thermal: bcm2835: Fix error code in 'bcm2835_thermal_probe'


> Christophe JAILLET <[email protected]> hat am 23. Juni 2017 um 21:44 geschrieben:
>
>
> 'tz' is a valid pointer at this point, so calling PTR_ERR on it is
> pointless.
> This 'err = PTR_ERR(tz)' looks like a cut'n'paste from a few lines above.
> So remove it. 'err' is already the error we want to report.
>
> Signed-off-by: Christophe JAILLET <[email protected]>

Thanks, but Dan Carpenter already send a fix for this.

2017-07-01 02:55:18

by Eduardo Valentin

[permalink] [raw]
Subject: Re: [PATCH v2] thermal: bcm2835: Fix error code in 'bcm2835_thermal_probe'

On Fri, Jun 23, 2017 at 10:25:45PM +0200, Stefan Wahren wrote:
>
> > Christophe JAILLET <[email protected]> hat am 23. Juni 2017 um 21:44 geschrieben:
> >
> >
> > 'tz' is a valid pointer at this point, so calling PTR_ERR on it is
> > pointless.
> > This 'err = PTR_ERR(tz)' looks like a cut'n'paste from a few lines above.
> > So remove it. 'err' is already the error we want to report.
> >
> > Signed-off-by: Christophe JAILLET <[email protected]>
>
> Thanks, but Dan Carpenter already send a fix for this.

Yeah, and I applied Dan's version as it was coming first in my queue. Sorry.