From 81528edadf420360fefef3676613dc482455fcf8 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Fri, 15 Mar 2013 08:59:54 -0400 Subject: [PATCH] --- yaml --- r: 363457 b: refs/heads/master c: 35b052a6c9a4de5eae6fee60663c9b6606651c1a h: refs/heads/master i: 363455: 391f64436943e0eaee0c8d80b0346cf2d81e57d5 v: v3 --- [refs] | 2 +- trunk/drivers/staging/omap-thermal/omap-thermal-common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92b2f2ce0d32..46a579f21f3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24796e128182ac6988a04d140134f953560b5083 +refs/heads/master: 35b052a6c9a4de5eae6fee60663c9b6606651c1a diff --git a/trunk/drivers/staging/omap-thermal/omap-thermal-common.c b/trunk/drivers/staging/omap-thermal/omap-thermal-common.c index 79a55aaae5a3..8aebc6a12c40 100644 --- a/trunk/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/trunk/drivers/staging/omap-thermal/omap-thermal-common.c @@ -260,7 +260,7 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, data = omap_bandgap_get_sensor_data(bg_ptr, id); - if (IS_ERR(data)) + if (IS_ERR_OR_NULL(data)) data = omap_thermal_build_data(bg_ptr, id); if (!data) @@ -309,7 +309,7 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id) struct omap_thermal_data *data; data = omap_bandgap_get_sensor_data(bg_ptr, id); - if (IS_ERR(data)) + if (IS_ERR_OR_NULL(data)) data = omap_thermal_build_data(bg_ptr, id); if (!data)