Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753396AbcKRXxE (ORCPT ); Fri, 18 Nov 2016 18:53:04 -0500 Received: from mail-pg0-f44.google.com ([74.125.83.44]:36529 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753113AbcKRXxC (ORCPT ); Fri, 18 Nov 2016 18:53:02 -0500 From: Brian Norris To: Zhang Rui , Eduardo Valentin Cc: Heiko Stuebner , linux-pm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Caesar Wang , Stephen Barber , Brian Norris Subject: [PATCH 1/3] thermal: handle get_temp() errors properly Date: Fri, 18 Nov 2016 15:52:55 -0800 Message-Id: <1479513177-81504-1-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1059 Lines: 32 If using CONFIG_THERMAL_EMULATION, there's a corner case where we might get an error from the zone's get_temp() callback, but we'll ignore that and keep using its value. Let's just error out properly instead. Signed-off-by: Brian Norris --- drivers/thermal/thermal_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 911fd964c742..0fa497f10d25 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -494,6 +494,8 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) mutex_lock(&tz->lock); ret = tz->ops->get_temp(tz, temp); + if (ret) + goto exit_unlock; if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) { for (count = 0; count < tz->trips; count++) { @@ -514,6 +516,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) *temp = tz->emul_temperature; } +exit_unlock: mutex_unlock(&tz->lock); exit: return ret; -- 2.8.0.rc3.226.g39d4020