diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-11 14:38:36 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 14:38:36 +0200 |
| commit | 7776f8e3f8708787d0d70aa08dedba714b2b54af (patch) | |
| tree | 0ac64ddfd11932060f28543ebd6ead3d3d4ecb97 | |
| parent | bc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff) | |
| parent | 2cc6b813579415c4f627b08a043079bdc5b87a33 (diff) | |
Merge tag 'samsung-non-critical-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical
Samsung non-critical fixes for v4.3
- fix sparse warning for returning iomem
- fix clock-frequency of display timing0 for exynos3250-rinato
* tag 'samsung-non-critical-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Use IOMEM_ERR_PTR when function returns iomem
ARM: dts: fix clock-frequency of display timing0 for exynos3250-rinato
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/exynos3250-rinato.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index 031853b75528..baa9b2f52009 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts @@ -182,7 +182,7 @@ display-timings { timing-0 { - clock-frequency = <0>; + clock-frequency = <4600000>; hactive = <320>; vactive = <320>; hfront-porch = <1>; diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 58e05a2eae57..98a2c0cbb833 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -182,7 +182,7 @@ static inline void __iomem *cpu_boot_reg(int cpu) boot_reg = cpu_boot_reg_base(); if (!boot_reg) - return ERR_PTR(-ENODEV); + return IOMEM_ERR_PTR(-ENODEV); if (soc_is_exynos4412()) boot_reg += 4*cpu; else if (soc_is_exynos5420() || soc_is_exynos5800()) |