summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/broadcom
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-07-05 14:51:32 +0800
committerZhang Rui <rui.zhang@intel.com>2017-07-05 14:51:32 +0800
commit467aebee872af7f5e703809e19a66de633a1aa2c (patch)
tree21a80e16c5e7a3c1d34c60fb6f6274eb9e6c1347 /drivers/thermal/broadcom
parentc0bc126f97fb929b3ae02c1c62322645d70eb408 (diff)
parent1fe3854a83b580727c9464b37b62ba77ead1d6f6 (diff)
downloadop-kernel-dev-467aebee872af7f5e703809e19a66de633a1aa2c.zip
op-kernel-dev-467aebee872af7f5e703809e19a66de633a1aa2c.tar.gz
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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index 0ecf808..e6863c8 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);
OpenPOWER on IntegriCloud