lkml.org 
[lkml]   [2013]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/50] staging: omap-thermal: fix error checking
    Date
    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>
    ---
    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 79a55aa..8aebc6a 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)
    --
    1.7.7.1.488.ge8e1c


    \
     
     \ /
      Last update: 2013-03-15 15:01    [W:3.634 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site