diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 18:02:13 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 18:02:13 +0300 |
| commit | 0690f4f2ef487259e9ce39f575c48c89745058f2 (patch) | |
| tree | 6b9435461cd024e1a49d648fe2487cdfe1c8f1a5 /drivers/thermal | |
| parent | 6701ef0318f76a9765a3fc762cbac405e024a8c2 (diff) | |
| parent | b28fec1324bf8f5010d2c3c5d57db4115bda66d4 (diff) | |
| download | linux-0690f4f2ef487259e9ce39f575c48c89745058f2.tar.xz | |
Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung 2nd fixes for v4.3" from Kukjin Kim:
- fix SOC detection of exynos thermal on exynos5260
- fix audio card detection on Peach boards
- fix double of_node_put() when parsing child power domains
* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
thermal: exynos: Fix register read in TMU
ARM: dts: Fix audio card detection on Peach boards
ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/samsung/exynos_tmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 0bae8cc6c23a..ca920b0ecf8f 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -932,7 +932,7 @@ static void exynos4412_tmu_set_emulation(struct exynos_tmu_data *data, if (data->soc == SOC_ARCH_EXYNOS5260) emul_con = EXYNOS5260_EMUL_CON; - if (data->soc == SOC_ARCH_EXYNOS5433) + else if (data->soc == SOC_ARCH_EXYNOS5433) emul_con = EXYNOS5433_TMU_EMUL_CON; else if (data->soc == SOC_ARCH_EXYNOS7) emul_con = EXYNOS7_TMU_REG_EMUL_CON; |