fpga: xilinx: Check if fpga operations are defined
authorMichal Simek <michal.simek@xilinx.com>
Wed, 16 Jul 2014 08:31:21 +0000 (10:31 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 21 Jan 2015 09:25:15 +0000 (10:25 +0100)
Ensure that operations are correctly setup.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/fpga/xilinx.c

index adb4b8cd25fdcce540f9d73c1aee49a920c09e7a..9c95148b25c1c7c0fde560f173f5376f7f41ce4a 100644 (file)
@@ -139,6 +139,11 @@ int xilinx_load(xilinx_desc *desc, const void *buf, size_t bsize,
                return FPGA_FAIL;
        }
 
+       if (!desc->operations || !desc->operations->load) {
+               printf("%s: Missing load operation\n", __func__);
+               return FPGA_FAIL;
+       }
+
        return desc->operations->load(desc, buf, bsize, bstype);
 }
 
@@ -151,8 +156,10 @@ int xilinx_loadfs(xilinx_desc *desc, const void *buf, size_t bsize,
                return FPGA_FAIL;
        }
 
-       if (!desc->operations->loadfs)
+       if (!desc->operations || !desc->operations->loadfs) {
+               printf("%s: Missing loadfs operation\n", __func__);
                return FPGA_FAIL;
+       }
 
        return desc->operations->loadfs(desc, buf, bsize, fpga_fsinfo);
 }
@@ -165,6 +172,11 @@ int xilinx_dump(xilinx_desc *desc, const void *buf, size_t bsize)
                return FPGA_FAIL;
        }
 
+       if (!desc->operations || !desc->operations->dump) {
+               printf("%s: Missing dump operation\n", __func__);
+               return FPGA_FAIL;
+       }
+
        return desc->operations->dump(desc, buf, bsize);
 }
 
@@ -228,7 +240,8 @@ int xilinx_info(xilinx_desc *desc)
 
                if (desc->iface_fns) {
                        printf ("Device Function Table @ 0x%p\n", desc->iface_fns);
-                       desc->operations->info(desc);
+                       if (desc->operations && desc->operations->info)
+                               desc->operations->info(desc);
                } else
                        printf ("No Device Function Table.\n");