projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e3e68f
)
arm64: zynqmp: Check return value in zynqmp_mmio_rawwrite()
author
Michal Simek
<michal.simek@xilinx.com>
Wed, 13 Jun 2018 08:38:33 +0000
(10:38 +0200)
committer
Michal Simek
<michal.simek@xilinx.com>
Fri, 15 Jun 2018 06:54:05 +0000
(08:54 +0200)
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>
arch/arm/cpu/armv8/zynqmp/cpu.c
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/armv8/zynqmp/cpu.c
b/arch/arm/cpu/armv8/zynqmp/cpu.c
index
e122be5
..
1279dc8
100644
(file)
--- 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;