Skip to content

Commit

Permalink
staging: omap-thermal: fix error checking
Browse files Browse the repository at this point in the history
The omap_bandgap_get_sensor_data() function returns ERR_PTR(),
but it can also return NULL, in case of initilization, so we need to use
IS_ERR_OR_NULL() rather than only IS_ERR().

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Eduardo Valentin authored and Greg Kroah-Hartman committed Mar 15, 2013
1 parent 24796e1 commit 35b052a
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 (IS_ERR(data))
if (IS_ERR_OR_NULL(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 (IS_ERR(data))
if (IS_ERR_OR_NULL(data))
data = omap_thermal_build_data(bg_ptr, id);

if (!data)
Expand Down

0 comments on commit 35b052a

Please sign in to comment.