aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal/thermal-generic-adc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/thermal/thermal-generic-adc.c')
-rw-r--r--drivers/thermal/thermal-generic-adc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/thermal/thermal-generic-adc.c b/drivers/thermal/thermal-generic-adc.c
index e22fc60ad36d..deb244f12de4 100644
--- a/drivers/thermal/thermal-generic-adc.c
+++ b/drivers/thermal/thermal-generic-adc.c
@@ -29,6 +29,9 @@ static int gadc_thermal_adc_to_temp(struct gadc_thermal_info *gti, int val)
29 int temp, temp_hi, temp_lo, adc_hi, adc_lo; 29 int temp, temp_hi, temp_lo, adc_hi, adc_lo;
30 int i; 30 int i;
31 31
32 if (!gti->lookup_table)
33 return val;
34
32 for (i = 0; i < gti->nlookup_table; i++) { 35 for (i = 0; i < gti->nlookup_table; i++) {
33 if (val >= gti->lookup_table[2 * i + 1]) 36 if (val >= gti->lookup_table[2 * i + 1])
34 break; 37 break;
@@ -81,9 +84,9 @@ static int gadc_thermal_read_linear_lookup_table(struct device *dev,
81 84
82 ntable = of_property_count_elems_of_size(np, "temperature-lookup-table", 85 ntable = of_property_count_elems_of_size(np, "temperature-lookup-table",
83 sizeof(u32)); 86 sizeof(u32));
84 if (ntable < 0) { 87 if (ntable <= 0) {
85 dev_err(dev, "Lookup table is not provided\n"); 88 dev_notice(dev, "no lookup table, assuming DAC channel returns milliCelcius\n");
86 return ntable; 89 return 0;
87 } 90 }
88 91
89 if (ntable % 2) { 92 if (ntable % 2) {