Merge branch 'parisc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[J-linux.git] / drivers / fpga / socfpga-a10.c

diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index be30c48eb6e492175150130d7bf5d866ea6460e6..573d88bdf7307d8e25659d875626d116f4694987 100644 (file)
--- a/drivers/fpga/socfpga-a10.c
+++ b/drivers/fpga/socfpga-a10.c
@@ -508,8 +508,8 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
                return -EBUSY;
        }
 
-       mgr = fpga_mgr_create(dev, "SoCFPGA Arria10 FPGA Manager",
-                             &socfpga_a10_fpga_mgr_ops, priv);
+       mgr = devm_fpga_mgr_create(dev, "SoCFPGA Arria10 FPGA Manager",
+                                  &socfpga_a10_fpga_mgr_ops, priv);
        if (!mgr)
                return -ENOMEM;
 
@@ -517,7 +517,6 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
 
        ret = fpga_mgr_register(mgr);
        if (ret) {
-               fpga_mgr_free(mgr);
                clk_disable_unprepare(priv->clk);
                return ret;
        }