Skip to content

Commit

Permalink
staging: omap-thermal: fix error check in omap_thermal_expose_sensor(…
Browse files Browse the repository at this point in the history
…) 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>
  • Loading branch information
Cyril Roelandt authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent fd958f7 commit ac6a98d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/omap-thermal/omap-thermal-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit ac6a98d

Please sign in to comment.