diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-10 19:31:24 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-10 19:31:24 +0300 |
commit | d22d59362b7b2c749245f1269d447011c76ca41d (patch) | |
tree | b3fc0673f62394dc5ed417eac6bad485a28baf25 /drivers/soc/qcom/rmtfs_mem.c | |
parent | a8afa92ec0d9312b23fd291aa8db95da266f2d5f (diff) | |
parent | 46fc033eba42f5a4fb583b2ab53f0a9918468452 (diff) | |
download | linux-d22d59362b7b2c749245f1269d447011c76ca41d.tar.xz |
Merge branch 'regulator-4.19' into regulator-next
Diffstat (limited to 'drivers/soc/qcom/rmtfs_mem.c')
-rw-r--r-- | drivers/soc/qcom/rmtfs_mem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c index c8999e38b005..8a3678c2e83c 100644 --- 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"); |