Commit f22a3bf0 authored by Amit Kucheria's avatar Amit Kucheria Committed by Daniel Lezcano

drivers: thermal: tsens: Release device in success path

We don't currently call put_device in case of successfully initialising
the device. So we hold the reference and keep the device pinned forever.

Allow control to fall through so we can use same code for success and
error paths to put_device.

As a part of this fixup, change devm_ioremap_resource to act on the same
device pointer as that used to allocate regmap memory. That ensures that
we are free to release op->dev after examining its resources.
Signed-off-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/d3996667e9f976bb30e97e301585cb1023be422e.1584015867.git.amit.kucheria@linaro.org
parent c1c6f3b3
...@@ -603,7 +603,7 @@ int __init init_common(struct tsens_priv *priv) ...@@ -603,7 +603,7 @@ int __init init_common(struct tsens_priv *priv)
/* DT with separate SROT and TM address space */ /* DT with separate SROT and TM address space */
priv->tm_offset = 0; priv->tm_offset = 0;
res = platform_get_resource(op, IORESOURCE_MEM, 1); res = platform_get_resource(op, IORESOURCE_MEM, 1);
srot_base = devm_ioremap_resource(&op->dev, res); srot_base = devm_ioremap_resource(dev, res);
if (IS_ERR(srot_base)) { if (IS_ERR(srot_base)) {
ret = PTR_ERR(srot_base); ret = PTR_ERR(srot_base);
goto err_put_device; goto err_put_device;
...@@ -621,7 +621,7 @@ int __init init_common(struct tsens_priv *priv) ...@@ -621,7 +621,7 @@ int __init init_common(struct tsens_priv *priv)
} }
res = platform_get_resource(op, IORESOURCE_MEM, 0); res = platform_get_resource(op, IORESOURCE_MEM, 0);
tm_base = devm_ioremap_resource(&op->dev, res); tm_base = devm_ioremap_resource(dev, res);
if (IS_ERR(tm_base)) { if (IS_ERR(tm_base)) {
ret = PTR_ERR(tm_base); ret = PTR_ERR(tm_base);
goto err_put_device; goto err_put_device;
...@@ -688,8 +688,6 @@ int __init init_common(struct tsens_priv *priv) ...@@ -688,8 +688,6 @@ int __init init_common(struct tsens_priv *priv)
tsens_enable_irq(priv); tsens_enable_irq(priv);
tsens_debug_init(op); tsens_debug_init(op);
return 0;
err_put_device: err_put_device:
put_device(&op->dev); put_device(&op->dev);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment