Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[platform/kernel/linux-rpi.git] / drivers / fpga / altera-hps2fpga.c

diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index a974d3f..77b95f2 100644 (file)
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -180,7 +180,8 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
                }
        }
 
-       br = fpga_bridge_create(dev, priv->name, &altera_hps2fpga_br_ops, priv);
+       br = devm_fpga_bridge_create(dev, priv->name,
+                                    &altera_hps2fpga_br_ops, priv);
        if (!br) {
                ret = -ENOMEM;
                goto err;
@@ -190,12 +191,10 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 
        ret = fpga_bridge_register(br);
        if (ret)
-               goto err_free;
+               goto err;
 
        return 0;
 
-err_free:
-       fpga_bridge_free(br);
 err:
        clk_disable_unprepare(priv->clk);