Skip to contentSkip to conversation

one fix for FPGA

PATCH New Alan Tull 1 participant 2 messages May 30, 2019

Subsystems (2)
lore
Share & tools
lore

Alan Tull

author
#0 lore raw

cover one fix for FPGA

Hi Greg,

Please take this FPGA fix. It have been reviewed on the mailing list and applies cleanly on current linux-next and char-misc-testing.

Thanks,
Alan

Moritz Fischer (1):
fpga: zynqmp-fpga: Correctly handle error pointer

 drivers/fpga/zynqmp-fpga.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 1/1 fpga: zynqmp-fpga: Correctly handle error pointer

From: Moritz Fischer <[email protected]>

Fixes the following static checker errors:

drivers/fpga/zynqmp-fpga.c:50 zynqmp_fpga_ops_write()
error: 'eemi_ops' dereferencing possible ERR_PTR()

drivers/fpga/zynqmp-fpga.c:84 zynqmp_fpga_ops_state()
error: 'eemi_ops' dereferencing possible ERR_PTR()

Note: This does not handle the EPROBE_DEFER value in a
special manner.

Fixes commit c09f7471127e ("fpga manager: Adding FPGA Manager support for Xilinx zynqmp")

---
 drivers/fpga/zynqmp-fpga.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/fpga/zynqmp-fpga.c +2 -2
index f7cbaadf49ab..b8a88d21d038 100644
@@ -47,7 +47,7 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,
 	char *kbuf;
 	int ret;
 
-	if (!eemi_ops || !eemi_ops->fpga_load)
+	if (IS_ERR_OR_NULL(eemi_ops) || !eemi_ops->fpga_load)
 		return -ENXIO;
 
 	priv = mgr->priv;
@@ -81,7 +81,7 @@ static enum fpga_mgr_states zynqmp_fpga_ops_state(struct fpga_manager *mgr)
 	const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
 	u32 status;
 
-	if (!eemi_ops || !eemi_ops->fpga_get_status)
+	if (IS_ERR_OR_NULL(eemi_ops) || !eemi_ops->fpga_get_status)
 		return FPGA_MGR_STATE_UNKNOWN;
 
 	eemi_ops->fpga_get_status(&status);
Signature · 1 line
2.21.0