[PATCH resend 02/12] soc: qcom: smem: initialize region struct only when successful

[Alex Elder]

Hold off initializing anything for the array entry representing a
memory region in qcom_smem_map_memory() until we know we've
successfully mapped it.

Signed-off-by: Alex Elder <el...@linaro.org>
---
 drivers/soc/qcom/smem.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index c46bb43c0f3d..d8008bf480a4 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -887,6 +887,7 @@ static int qcom_smem_map_memory(struct qcom_smem *smem, 
struct device *dev,
 {
        struct device_node *np;
        struct resource r;
+       resource_size_t size;
        int ret;
 
        np = of_parse_phandle(dev->of_node, name, 0);
@@ -899,12 +900,13 @@ static int qcom_smem_map_memory(struct qcom_smem *smem, 
struct device *dev,
        of_node_put(np);
        if (ret)
                return ret;
+       size = resource_size(&r);
 
-       smem->regions[i].aux_base = (u32)r.start;
-       smem->regions[i].size = resource_size(&r);
-       smem->regions[i].virt_base = devm_ioremap_wc(dev, r.start, 
resource_size(&r));
+       smem->regions[i].virt_base = devm_ioremap_wc(dev, r.start, size);
        if (!smem->regions[i].virt_base)
                return -ENOMEM;
+       smem->regions[i].aux_base = (u32)r.start;
+       smem->regions[i].size = size;
 
        return 0;
 }
-- 
2.17.1