1 files changed, 16 insertions, 3 deletions

diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index b6672e66cda6..51efaf9e0e03 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -555,6 +555,7 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct socfpga_fpga_priv *priv;
+        struct fpga_manager *mgr;
         struct resource *res;
         int ret;
 
@@ -581,13 +582,25 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                                 &socfpga_fpga_ops, priv);
+        mgr = fpga_mgr_create(dev, "Altera SOCFPGA FPGA Manager",
+                              &socfpga_fpga_ops, priv);
+        if (!mgr)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, mgr);
+
+        ret = fpga_mgr_register(mgr);
+        if (ret)
+                fpga_mgr_free(mgr);
+
+        return ret;
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
 {
-        fpga_mgr_unregister(&pdev->dev);
+        struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+        fpga_mgr_unregister(mgr);
 
         return 0;
 }