soc: qcom: rmtfs-mem: fix memleak in probe error paths

Make sure to set the mem device release callback before calling
put_device() in a couple of probe error paths so that the containing
object also gets freed.

Fixes: d1de6d6c639b ("soc: qcom: Remote filesystem memory driver")
Cc: stable <stable@vger.kernel.org>     # 4.15
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c
index c8999e38b005b5d85616e6a4073347fa57c0659a..8a3678c2e83cf609daddfdcd7c50e9de0a671ad2 100644 (file)
--- a/drivers/soc/qcom/rmtfs_mem.c
+++ b/drivers/soc/qcom/rmtfs_mem.c
@@ -184,6 +184,7 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
        device_initialize(&rmtfs_mem->dev);
        rmtfs_mem->dev.parent = &pdev->dev;
        rmtfs_mem->dev.groups = qcom_rmtfs_mem_groups;
+       rmtfs_mem->dev.release = qcom_rmtfs_mem_release_device;
 
        rmtfs_mem->base = devm_memremap(&rmtfs_mem->dev, rmtfs_mem->addr,
                                        rmtfs_mem->size, MEMREMAP_WC);
@@ -206,8 +207,6 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
                goto put_device;
        }
 
-       rmtfs_mem->dev.release = qcom_rmtfs_mem_release_device;
-
        ret = of_property_read_u32(node, "qcom,vmid", &vmid);
        if (ret < 0 && ret != -EINVAL) {
                dev_err(&pdev->dev, "failed to parse qcom,vmid\n");