diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2017-05-06 19:30:53 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-05-06 19:30:53 +0800 |
| commit | e4cb5bb286af409d814e4d13c650a736769b854b (patch) | |
| tree | 10fe0c97da03e6365df883d5c8ffed52a47f8d45 /drivers/thermal/mtk_thermal.c | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
| parent | 05d7839aa290901429d8edcd8f7974c9df2bcaa5 (diff) | |
| download | linux-stable-e4cb5bb286af409d814e4d13c650a736769b854b.tar.gz linux-stable-e4cb5bb286af409d814e4d13c650a736769b854b.tar.bz2 linux-stable-e4cb5bb286af409d814e4d13c650a736769b854b.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/mtk_thermal.c')
| -rw-r--r-- | drivers/thermal/mtk_thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index 1aff7fde54b1..7737f14846f9 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -191,7 +191,7 @@ static const int mt8173_bank_data[MT8173_NUM_ZONES][3] = { }; static const int mt8173_msr[MT8173_NUM_SENSORS_PER_ZONE] = { - TEMP_MSR0, TEMP_MSR1, TEMP_MSR2, TEMP_MSR2 + TEMP_MSR0, TEMP_MSR1, TEMP_MSR2, TEMP_MSR3 }; static const int mt8173_adcpnp[MT8173_NUM_SENSORS_PER_ZONE] = { |