From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 13 Jun 2018 08:38:33 +0000 (+0200)
Subject: arm64: zynqmp: Check return value in zynqmp_mmio_rawwrite()
X-Git-Tag: v2018.07-rc2~49^2~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e3c26b8d954084613de7a13fa6472d2f03429d0e;p=u-boot

arm64: zynqmp: Check return value in zynqmp_mmio_rawwrite()

There should be return value check from zynqmp_mmio_read() in
zynqmp_mmio_rawwrite() to make sure that errors are propagated properly.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c
index e122be59c7..1279dc8658 100644
--- a/arch/arm/cpu/armv8/zynqmp/cpu.c
+++ b/arch/arm/cpu/armv8/zynqmp/cpu.c
@@ -212,8 +212,12 @@ static int zynqmp_mmio_rawwrite(const u32 address,
 {
 	u32 data;
 	u32 value_local = value;
+	int ret;
+
+	ret = zynqmp_mmio_read(address, &data);
+	if (ret)
+		return ret;
 
-	zynqmp_mmio_read(address, &data);
 	data &= ~mask;
 	value_local &= mask;
 	value_local |= data;