From: Eduardo Valentin Date: Thu, 25 Apr 2013 14:13:33 +0000 (+0000) Subject: thermal: thermal_core: remove usage of IS_ERR_OR_NULL X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9b19ec39b0a92b13e487033e81257f9989867710;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Cc: Russell King Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin Signed-off-by: Zhang Rui --- diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index f36cd44816d..d755440791b 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);