From 60e951125613588b94869586334aba7bfa276351 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Thu, 15 Dec 2011 22:28:24 +0000 Subject: [PATCH] --- yaml --- r: 296987 b: refs/heads/master c: 0266e49b3fd37065f9f90856c75f442c020bd96e h: refs/heads/master i: 296985: 777dfe1faa457acdbd57c5b679ee4d63c890fbea 296983: 1af2893fd421202fae82dc4200438c1adf45d0c4 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/intel_mid_thermal.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a5739598d92..7e4debaade14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 420138a7477eaebafddaefb7412736d924ca7d73 +refs/heads/master: 0266e49b3fd37065f9f90856c75f442c020bd96e diff --git a/trunk/drivers/platform/x86/intel_mid_thermal.c b/trunk/drivers/platform/x86/intel_mid_thermal.c index b07f93d64a91..acd7d2d3d912 100644 --- a/trunk/drivers/platform/x86/intel_mid_thermal.c +++ b/trunk/drivers/platform/x86/intel_mid_thermal.c @@ -360,8 +360,10 @@ static int mid_initialize_adc(struct device *dev) if (ret) return ret; - if (data & MSIC_ADCTHERM_MASK) - dev_warn(dev, "ADCTHERM already set"); + data &= ~MSIC_ADCTHERM_MASK; + ret = intel_msic_reg_write(INTEL_MSIC_ADC1CNTL3, data); + if (ret) + return ret; /* Index of the first channel in which the stop bit is set */ channel_index = find_free_channel();