]> Pileus Git - ~andy/linux/commitdiff
staging: omap-thermal: fix error check in omap_thermal_expose_sensor() and in omap_th...
authorCyril Roelandt <tipecaml@gmail.com>
Wed, 12 Dec 2012 00:24:50 +0000 (01:24 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Jan 2013 22:53:58 +0000 (14:53 -0800)
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>
drivers/staging/omap-thermal/omap-thermal-common.c

index 61f1070c666777db427d2267dc1ab76d046ce29b..79a55aaae5a3aef7e9682dfb2b3543611dd97e1f 100644 (file)
@@ -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)