From ae97f6f0b96fa2e3069b3d3209a380e242ecd9ca Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Wed, 12 Dec 2012 01:24:50 +0100 Subject: [PATCH] --- yaml --- r: 353959 b: refs/heads/master c: ac6a98d452baa4f9acae7c2238f6626bae8283ff h: refs/heads/master i: 353957: 579b320933ba55c7f4eab6c7380e1284f6bef980 353955: 789479f50ae31d4c81007be125a76add8b79ba93 353951: cfd76ce2a40fe6bb21aa8079cdc092eb6e3320e8 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 49d8e6cd68d5..4f4b9bb0aa26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd958f7eb4d0959f65377aaab4a63ba33cc53f06 +refs/heads/master: ac6a98d452baa4f9acae7c2238f6626bae8283ff diff --git a/trunk/drivers/staging/omap-thermal/omap-thermal-common.c b/trunk/drivers/staging/omap-thermal/omap-thermal-common.c index 61f1070c6667..79a55aaae5a3 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 (!data) + if (IS_ERR(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 (!data) + if (IS_ERR(data)) data = omap_thermal_build_data(bg_ptr, id); if (!data)