From eb2752b95f4ed801610e4276fa7c66f8e2a3e979 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Fri, 15 Mar 2013 09:00:10 -0400 Subject: [PATCH] --- yaml --- r: 363473 b: refs/heads/master c: 204705992112e75f7f69cca191d89bf1104df7c2 h: refs/heads/master i: 363471: 3737497d0ad59597063633029a638183a27b70f3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/omap-thermal/omap-bandgap.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c01d918591bd..d5a9eef1a940 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf7a979d439c4d518f0a9d6ea1ff6029e5817ae3 +refs/heads/master: 204705992112e75f7f69cca191d89bf1104df7c2 diff --git a/trunk/drivers/staging/omap-thermal/omap-bandgap.c b/trunk/drivers/staging/omap-thermal/omap-bandgap.c index a7fd3e89ecde..0068c6651989 100644 --- a/trunk/drivers/staging/omap-thermal/omap-bandgap.c +++ b/trunk/drivers/staging/omap-thermal/omap-bandgap.c @@ -238,14 +238,19 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr, int id, int adc_val, int *t) { struct temp_sensor_data *ts_data = bg_ptr->conf->sensors[id].ts_data; + int ret = 0; /* look up for temperature in the table and return the temperature */ - if (adc_val < ts_data->adc_start_val || adc_val > ts_data->adc_end_val) - return -ERANGE; + if (adc_val < ts_data->adc_start_val || + adc_val > ts_data->adc_end_val) { + ret = -ERANGE; + goto exit; + } *t = bg_ptr->conf->conv_table[adc_val - ts_data->adc_start_val]; - return 0; +exit: + return ret; } static int temp_to_adc_conversion(long temp, struct omap_bandgap *bg_ptr, int i,