diff options
| author | Eduardo Valentin | 2013-04-25 16:13:33 +0200 |
|---|---|---|
| committer | Zhang Rui | 2013-04-27 03:28:25 +0200 |
| commit | 9b19ec39b0a92b13e487033e81257f9989867710 (patch) | |
| tree | d86e5654870317158b451cb3ad07b41c1ecfeb2d | |
| parent | Merge branch 'cpu_cooling-doc-comments-update' of .git into next (diff) | |
| download | kernel-qcow2-linux-9b19ec39b0a92b13e487033e81257f9989867710.tar.gz kernel-qcow2-linux-9b19ec39b0a92b13e487033e81257f9989867710.tar.xz kernel-qcow2-linux-9b19ec39b0a92b13e487033e81257f9989867710.zip | |
thermal: thermal_core: remove usage of IS_ERR_OR_NULL
This patch changes the driver to avoid the usage of IS_ERR_OR_NULL()
macro. This macro can lead to dangerous results, like returning
success (0) during a failure scenario (NULL pointer handling).
The case present in this patch has simply be translated to
normal check for NULL and if the pointer has an error code.
The later case is needed because functions like
thermal_zone_get_zone_by_name() could return an ERR_PTR().
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/thermal_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index f36cd44816d8..d755440791b7 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -388,7 +388,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp) enum thermal_trip_type type; #endif - if (IS_ERR_OR_NULL(tz)) + if (!tz || IS_ERR(tz)) goto exit; mutex_lock(&tz->lock); |