---

yaml --- r: 296987 b: refs/heads/master c: 0266e49 h: refs/heads/master i: 296985: 777dfe1 296983: 1af2893 v: v3
git-mirror · Mar 20, 2012 · 60e9511 · 60e9511
1 parent 95a65e3
commit 60e9511
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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();