Merge tag 'for-linus-5.17-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index 573d88bdf7307d8e25659d875626d116f4694987..ac8e89b8a5cc9705b1ee2e4bfe628e3f454f8e3c 100644 (file)
--- a/drivers/fpga/socfpga-a10.c
+++ b/drivers/fpga/socfpga-a10.c
@@ -508,19 +508,15 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
                return -EBUSY;
        }
 
-       mgr = devm_fpga_mgr_create(dev, "SoCFPGA Arria10 FPGA Manager",
-                                  &socfpga_a10_fpga_mgr_ops, priv);
-       if (!mgr)
-               return -ENOMEM;
-
-       platform_set_drvdata(pdev, mgr);
-
-       ret = fpga_mgr_register(mgr);
-       if (ret) {
+       mgr = fpga_mgr_register(dev, "SoCFPGA Arria10 FPGA Manager",
+                               &socfpga_a10_fpga_mgr_ops, priv);
+       if (IS_ERR(mgr)) {
                clk_disable_unprepare(priv->clk);
-               return ret;
+               return PTR_ERR(mgr);
        }
 
+       platform_set_drvdata(pdev, mgr);
+
        return 0;
 }