Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof...

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

diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c
index 167abb0b08d402b52e45488ea1b7bab2ee4a4606..8e6e9c840d9df9b7a32f8bd6ffab17a0e1481f79 100644 (file)
--- a/drivers/fpga/ts73xx-fpga.c
+++ b/drivers/fpga/ts73xx-fpga.c
@@ -116,12 +116,9 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
        if (IS_ERR(priv->io_base))
                return PTR_ERR(priv->io_base);
 
-       mgr = devm_fpga_mgr_create(kdev, "TS-73xx FPGA Manager",
-                                  &ts73xx_fpga_ops, priv);
-       if (!mgr)
-               return -ENOMEM;
-
-       return devm_fpga_mgr_register(kdev, mgr);
+       mgr = devm_fpga_mgr_register(kdev, "TS-73xx FPGA Manager",
+                                    &ts73xx_fpga_ops, priv);
+       return PTR_ERR_OR_ZERO(mgr);
 }
 
 static struct platform_driver ts73xx_fpga_driver = {