Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemo...

[J-linux.git] / drivers / fpga / of-fpga-region.c

diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index e3c25576b6b9d3d90206a8e43cbb8f99b55545c8..50b83057c04855906afd9bf574f0f96ef1efee68 100644 (file)
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -405,16 +405,12 @@ static int of_fpga_region_probe(struct platform_device *pdev)
        if (IS_ERR(mgr))
                return -EPROBE_DEFER;
 
-       region = devm_fpga_region_create(dev, mgr, of_fpga_region_get_bridges);
-       if (!region) {
-               ret = -ENOMEM;
+       region = fpga_region_register(dev, mgr, of_fpga_region_get_bridges);
+       if (IS_ERR(region)) {
+               ret = PTR_ERR(region);
                goto eprobe_mgr_put;
        }
 
-       ret = fpga_region_register(region);
-       if (ret)
-               goto eprobe_mgr_put;
-
        of_platform_populate(np, fpga_region_of_match, NULL, &region->dev);
        platform_set_drvdata(pdev, region);
 
@@ -448,7 +444,7 @@ static struct platform_driver of_fpga_region_driver = {
 };
 
 /**
- * fpga_region_init - init function for fpga_region class
+ * of_fpga_region_init - init function for fpga_region class
  * Creates the fpga_region class and registers a reconfig notifier.
  */
 static int __init of_fpga_region_init(void)