---

yaml --- r: 292771 b: refs/heads/master c: 1b7ccab h: refs/heads/master i: 292769: 6af8f43 292767: 952bfa2 v: v3
git-mirror · Mar 6, 2012 · b31f6e3 · b31f6e3
1 parent 82d0300
commit b31f6e3
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: 634830704d80ee0f544c16ea3c19dd2e819d2256
+refs/heads/master: 1b7ccabcc372152d1492241610e52b8ea14b0968
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();