Commit 7776f8e3 authored Aug 11, 2015 by Olof Johansson

Merge tag 'samsung-non-critical-1' of...

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>

parents bc0195aa 2cc6b813

arch/arm/boot/dts/exynos3250-rinato.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@

		display-timings {
		timing-0 {
		clock-frequency = <0>;
		clock-frequency = <4600000>;
		hactive = <320>;
		vactive = <320>;
		hfront-porch = <1>;

arch/arm/mach-exynos/platsmp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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())