Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363473
b: refs/heads/master
c: 2047059
h: refs/heads/master
i:
  363471: 3737497
v: v3
  • Loading branch information
Eduardo Valentin authored and Greg Kroah-Hartman committed Mar 15, 2013
1 parent b4bd529 commit eb2752b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf7a979d439c4d518f0a9d6ea1ff6029e5817ae3
refs/heads/master: 204705992112e75f7f69cca191d89bf1104df7c2
11 changes: 8 additions & 3 deletions trunk/drivers/staging/omap-thermal/omap-bandgap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit eb2752b

Please sign in to comment.