Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux.git] / drivers / fpga / zynq-fpga.c

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 3110e00121ca0fa6aa80fc29b6c9e1a1f5290e3d..bb82efeebb9d5bd9dd135c247bf30a82a55b3410 100644 (file)
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -614,8 +614,8 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 
        clk_disable(priv->clk);
 
-       mgr = fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager",
-                             &zynq_fpga_ops, priv);
+       mgr = devm_fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager",
+                                  &zynq_fpga_ops, priv);
        if (!mgr)
                return -ENOMEM;
 
@@ -624,7 +624,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
        err = fpga_mgr_register(mgr);
        if (err) {
                dev_err(dev, "unable to register FPGA manager\n");
-               fpga_mgr_free(mgr);
                clk_unprepare(priv->clk);
                return err;
        }