Skip to contentSkip to conversation

ARM: socfpga: checking the wrong variable

PATCH In review Dan Carpenter 3 participants 3 messages Nov 15, 2016

Subsystems (2)
Kernel janitors FPGA manager framework
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ARM: socfpga: checking the wrong variable

This is a cut and paste bug. We had intended to check "sysmgr".

Fixes e5f8efa5c8bf ("ARM: socfpga: fpga bridge driver support")
Signed-off-by Dan Carpenter <[email protected]>
drivers/fpga/altera-fpga2sdram.c +1 -1
index 7ab358e..d4eeb74 100644
@@ -123,7 +123,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 	}
 
 	sysmgr = syscon_regmap_lookup_by_compatible("altr,sys-mgr");
-	if (IS_ERR(priv->sdrctl)) {
+	if (IS_ERR(sysmgr)) {
 		dev_err(dev, "regmap for altr,sys-mgr lookup failed.\n");
 		return PTR_ERR(sysmgr);
 	}
Acked-by on v1 1/1
#1 lore raw

Hi Dan,

Quoted 4 lines · Dan Carpenter

This is a cut and paste bug. We had intended to check "sysmgr".

Fixes e5f8efa5c8bf ("ARM: socfpga: fpga bridge driver support")
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Moritz Fischer <[email protected]>
Quoted 6 lines
drivers/fpga/altera-fpga2sdram.c +0 -0
index 7ab358e..d4eeb74 100644

drivers/fpga/altera-fpga2sdram.c static int alt_fpga_bridge_probe(struct platform_device *pdev) · line 129

Quoted 8 lines
drivers/fpga/altera-fpga2sdram.c +1 -1
@@ -123,7 +123,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
        }
 
        sysmgr = syscon_regmap_lookup_by_compatible("altr,sys-mgr");
-       if (IS_ERR(priv->sdrctl)) {
+       if (IS_ERR(sysmgr)) {
                dev_err(dev, "regmap for altr,sys-mgr lookup failed.\n");
                return PTR_ERR(sysmgr);
        }

Thanks,

Moritz

Acked-by
#2 lore raw
Quoted 7 lines · Moritz Fischer

Hi Dan,

Quoted 4 lines · Dan Carpenter

This is a cut and paste bug. We had intended to check "sysmgr".

Fixes e5f8efa5c8bf ("ARM: socfpga: fpga bridge driver support")
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Moritz Fischer <[email protected]>

Hi Dan,

Acked-by Alan Tull <[email protected]>

Thanks for catching this!

Alan

Quoted 20 lines
Quoted 7 lines
drivers/fpga/altera-fpga2sdram.c +0 -0
index 7ab358e..d4eeb74 100644

drivers/fpga/altera-fpga2sdram.c static int alt_fpga_bridge_probe(struct platform_device *pdev) · line 129

Quoted 8 lines
drivers/fpga/altera-fpga2sdram.c +1 -1
@@ -123,7 +123,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
        }
 
        sysmgr = syscon_regmap_lookup_by_compatible("altr,sys-mgr");
-       if (IS_ERR(priv->sdrctl)) {
+       if (IS_ERR(sysmgr)) {
                dev_err(dev, "regmap for altr,sys-mgr lookup failed.\n");
                return PTR_ERR(sysmgr);
        }

Thanks,

Moritz