Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof...

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

diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera-fpga2sdram.c
index a78e49c63c640d3fb8313d6015bd6af9f0607e80..ff3a646fd9e32fab30acef6a4a4e373c85a7c697 100644 (file)
--- a/drivers/fpga/altera-fpga2sdram.c
+++ b/drivers/fpga/altera-fpga2sdram.c
@@ -121,17 +121,13 @@ 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 = devm_fpga_bridge_create(dev, F2S_BRIDGE_NAME,
-                                    &altera_fpga2sdram_br_ops, priv);
-       if (!br)
-               return -ENOMEM;
+       br = fpga_bridge_register(dev, F2S_BRIDGE_NAME,
+                                 &altera_fpga2sdram_br_ops, priv);
+       if (IS_ERR(br))
+               return PTR_ERR(br);
 
        platform_set_drvdata(pdev, br);
 
-       ret = fpga_bridge_register(br);
-       if (ret)
-               return ret;
-
        dev_info(dev, "driver initialized with handoff %08x\n", priv->mask);
 
        if (!of_property_read_u32(dev->of_node, "bridge-enable", &enable)) {