diff options
| author |   Cyril Roelandt <tipecaml@gmail.com> | 2012-12-12 01:24:50 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 14:53:58 -0800 |
| commit | ac6a98d452baa4f9acae7c2238f6626bae8283ff (patch) | |
| tree | c2fcf413c930e138f44d133224c49f8d3e8026f3 /drivers/staging/omap-thermal | |
| parent | staging: comedi: Makefile: conditionally compile multi-file core module (diff) | |
| download | linux-dev-ac6a98d452baa4f9acae7c2238f6626bae8283ff.tar.xz linux-dev-ac6a98d452baa4f9acae7c2238f6626bae8283ff.zip | |
staging: omap-thermal: fix error check in omap_thermal_expose_sensor() and in omap_thermal_register_cpu_cooling().
The omap_bandgap_get_sensor_data() function returns ERR_PTR(), so we need to use
IS_ERR() rather than a NULL check.
Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/omap-thermal')
| -rw-r--r-- | drivers/staging/omap-thermal/omap-thermal-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/omap-thermal/omap-thermal-common.c b/drivers/staging/omap-thermal/omap-thermal-common.c index 61f1070c6667..79a55aaae5a3 100644 --- a/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/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) |