Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / fpga / altera-fpga2sdram.c

diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera-fpga2sdram.c
index 23660ccd634b13ba5cdc62ef6d82c6fe6b3cd780..a78e49c63c640d3fb8313d6015bd6af9f0607e80 100644 (file)
--- a/drivers/fpga/altera-fpga2sdram.c
+++ b/drivers/fpga/altera-fpga2sdram.c
@@ -121,18 +121,16 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
        /* Get f2s bridge configuration saved in handoff register */
        regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask);
 
-       br = fpga_bridge_create(dev, F2S_BRIDGE_NAME,
-                               &altera_fpga2sdram_br_ops, priv);
+       br = devm_fpga_bridge_create(dev, F2S_BRIDGE_NAME,
+                                    &altera_fpga2sdram_br_ops, priv);
        if (!br)
                return -ENOMEM;
 
        platform_set_drvdata(pdev, br);
 
        ret = fpga_bridge_register(br);
-       if (ret) {
-               fpga_bridge_free(br);
+       if (ret)
                return ret;
-       }
 
        dev_info(dev, "driver initialized with handoff %08x\n", priv->mask);