Skip to content

S
Simple VME FMC Carrier SVEC
Commit 9c90f5c1 authored by Vaibhav Gupta's avatar Vaibhav Gupta
Browse files
Options

[Fix]: software: kernel: svec-core-fpga: The code returns false failure 

After this:
	commit 156b03ec ("software: kernel:
	svec-core-fpga: Update API 'debugfs_create_regset32'")

The pointer `svec_fpga->dbg_csr` was never initialized. And when we
check it for "IS_ERR_ORNULL", we get false failure.

Thus, put conditional directive for this API update.
Signed-off-by: 's avatarVaibhav Gupta <vaibhav.gupta@cern.ch>
parent 6fe043a9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
software/kernel/svec-core-fpga.c
View file @ 9c90f5c1
......@@ -156,8 +156,13 @@ static int svec_fpga_dbg_init(struct svec_fpga *svec_fpga)
svec_fpga->dbg_csr_reg.regs = svec_fpga_debugfs_reg32;
svec_fpga->dbg_csr_reg.nregs = ARRAY_SIZE(svec_fpga_debugfs_reg32);
svec_fpga->dbg_csr_reg.base = svec_fpga->fpga;
#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE
debugfs_create_regset32(SVEC_DBG_CSR_NAME, 0200, svec_fpga->dbg_dir,
&svec_fpga->dbg_csr_reg);
#else
svec_fpga->dbg_csr = debugfs_create_regset32(SVEC_DBG_CSR_NAME, 0200,
svec_fpga->dbg_dir,
&svec_fpga->dbg_csr_reg);
if (IS_ERR_OR_NULL(svec_fpga->dbg_csr)) {
err = PTR_ERR(svec_fpga->dbg_csr);
svec_fpga->dbg_csr = NULL;
......@@ -166,6 +171,7 @@ static int svec_fpga_dbg_init(struct svec_fpga *svec_fpga)
SVEC_DBG_CSR_NAME, err);
goto err;
}
#endif
svec_fpga->dbg_bld_info = debugfs_create_file(SVEC_DBG_BLD_INFO_NAME,
0444,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment