3 files changed, 3 insertions, 6 deletions

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 0bb7b5cd6cdc..c20445b867ae 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -104,7 +104,7 @@ config SOCFPGA_FPGA_BRIDGE
 
 config ALTERA_FREEZE_BRIDGE
         tristate "Altera FPGA Freeze Bridge"
-        depends on ARCH_SOCFPGA && FPGA_BRIDGE
+        depends on FPGA_BRIDGE && HAS_IOMEM
         help
           Say Y to enable drivers for Altera FPGA Freeze bridges.  A
           freeze bridge is a bridge that exists in the FPGA fabric to
diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c
index 8c18beec6b57..678d0115f840 100644
--- a/drivers/fpga/altera-ps-spi.c
+++ b/drivers/fpga/altera-ps-spi.c
@@ -205,7 +205,7 @@ static int altera_ps_write_complete(struct fpga_manager *mgr,
                                     struct fpga_image_info *info)
 {
         struct altera_ps_conf *conf = mgr->priv;
-        const char dummy[] = {0};
+        static const char dummy[] = {0};
         int ret;
 
         if (gpiod_get_value_cansleep(conf->status)) {
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index a1a09e04fab8..13851b3d1c56 100644
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -508,14 +508,11 @@ static int __init s10_init(void)
                 return -ENODEV;
 
         np = of_find_matching_node(fw_np, s10_of_match);
-        if (!np) {
-                of_node_put(fw_np);
+        if (!np)
                 return -ENODEV;
-        }
 
         of_node_put(np);
         ret = of_platform_populate(fw_np, s10_of_match, NULL, NULL);
-        of_node_put(fw_np);
         if (ret)
                 return ret;