Merge tag 'folio-5.17a' of git://git.infradead.org/users/willy/pagecache

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

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 9b75bd4f93d8e0351193a6bda9d01a3e06fd6328..426aa34c6a0dcdc96a2a13caa6ee13613e7e6bec 100644 (file)
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -609,20 +609,16 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 
        clk_disable(priv->clk);
 
-       mgr = devm_fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager",
-                                  &zynq_fpga_ops, priv);
-       if (!mgr)
-               return -ENOMEM;
-
-       platform_set_drvdata(pdev, mgr);
-
-       err = fpga_mgr_register(mgr);
-       if (err) {
+       mgr = fpga_mgr_register(dev, "Xilinx Zynq FPGA Manager",
+                               &zynq_fpga_ops, priv);
+       if (IS_ERR(mgr)) {
                dev_err(dev, "unable to register FPGA manager\n");
                clk_unprepare(priv->clk);
-               return err;
+               return PTR_ERR(mgr);
        }
 
+       platform_set_drvdata(pdev, mgr);
+
        return 0;
 }