Merge tag 'char-misc-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[platform/kernel/linux-rpi.git] / drivers / firmware / xilinx / zynqmp.c

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 60eb6bd..f8c4eb2 100644 (file)
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -942,8 +942,16 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_reset_get_status);
  */
 int zynqmp_pm_fpga_load(const u64 address, const u32 size, const u32 flags)
 {
-       return zynqmp_pm_invoke_fn(PM_FPGA_LOAD, lower_32_bits(address),
-                                  upper_32_bits(address), size, flags, NULL);
+       u32 ret_payload[PAYLOAD_ARG_CNT];
+       int ret;
+
+       ret = zynqmp_pm_invoke_fn(PM_FPGA_LOAD, lower_32_bits(address),
+                                 upper_32_bits(address), size, flags,
+                                 ret_payload);
+       if (ret_payload[0])
+               return -ret_payload[0];
+
+       return ret;
 }
 EXPORT_SYMBOL_GPL(zynqmp_pm_fpga_load);