From b31f6e35aa3c2fa47644b261edfc531a71abf382 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Mon, 5 Mar 2012 15:01:04 -0800 Subject: [PATCH] --- yaml --- r: 292771 b: refs/heads/master c: 1b7ccabcc372152d1492241610e52b8ea14b0968 h: refs/heads/master i: 292769: 6af8f43bf4a319a6c88cc0568b148fc1ba1a8f6f 292767: 952bfa2ee4f5cb0478f6e4d828468cd7750076e5 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 57422cb2033a..d4b0a408089e 100644 --- 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 index 5917b3c83728..2ee9766737ea 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();