diff options
| author |   Zhang Rui <rui.zhang@intel.com> | 2017-07-05 14:51:32 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-07-05 14:51:32 +0800 |
| commit | 467aebee872af7f5e703809e19a66de633a1aa2c (patch) | |
| tree | 21a80e16c5e7a3c1d34c60fb6f6274eb9e6c1347 /drivers/thermal/broadcom | |
| parent | Linux 4.12-rc7 (diff) | |
| parent | thermal: bcm2835: fix an error code in probe() (diff) | |
| download | linux-dev-467aebee872af7f5e703809e19a66de633a1aa2c.tar.xz linux-dev-467aebee872af7f5e703809e19a66de633a1aa2c.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/broadcom')
| -rw-r--r-- | drivers/thermal/broadcom/bcm2835_thermal.c | 1 |
1 files changed, 0 insertions, 1 deletions
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); |