diff options
| author |   Eduardo Valentin <eduardo.valentin@ti.com> | 2013-03-15 08:59:54 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-15 09:02:08 -0700 |
| commit | 35b052a6c9a4de5eae6fee60663c9b6606651c1a (patch) | |
| tree | a6293565041949c272d319b4df19bdd5cea41bfa /drivers/staging/omap-thermal | |
| parent | staging: omap-thermal: style cleanup on omap-bandgap.c (diff) | |
| download | linux-dev-35b052a6c9a4de5eae6fee60663c9b6606651c1a.tar.xz linux-dev-35b052a6c9a4de5eae6fee60663c9b6606651c1a.zip | |
staging: omap-thermal: fix error checking
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>
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 79a55aaae5a3..8aebc6a12c40 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 (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) |