Merge tag 'fs.close_range.v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / memory / fsl_ifc.c

diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c
index 89f99b5..d062c2f 100644 (file)
--- a/drivers/memory/fsl_ifc.c
+++ b/drivers/memory/fsl_ifc.c
@@ -97,7 +97,6 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev)
        iounmap(ctrl->gregs);
 
        dev_set_drvdata(&dev->dev, NULL);
-       kfree(ctrl);
 
        return 0;
 }
@@ -209,7 +208,8 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
 
        dev_info(&dev->dev, "Freescale Integrated Flash Controller\n");
 
-       fsl_ifc_ctrl_dev = kzalloc(sizeof(*fsl_ifc_ctrl_dev), GFP_KERNEL);
+       fsl_ifc_ctrl_dev = devm_kzalloc(&dev->dev, sizeof(*fsl_ifc_ctrl_dev),
+                                       GFP_KERNEL);
        if (!fsl_ifc_ctrl_dev)
                return -ENOMEM;
 
@@ -219,8 +219,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
        fsl_ifc_ctrl_dev->gregs = of_iomap(dev->dev.of_node, 0);
        if (!fsl_ifc_ctrl_dev->gregs) {
                dev_err(&dev->dev, "failed to get memory region\n");
-               ret = -ENODEV;
-               goto err;
+               return -ENODEV;
        }
 
        if (of_property_read_bool(dev->dev.of_node, "little-endian")) {
@@ -295,6 +294,7 @@ err_irq:
        free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev);
        irq_dispose_mapping(fsl_ifc_ctrl_dev->irq);
 err:
+       iounmap(fsl_ifc_ctrl_dev->gregs);
        return ret;
 }