mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

thermal/qcom/tsens-common : fix possible object reference leak

Browse source 
of_find_device_by_node() takes a reference to the struct device
when it finds a match via get_device.
We also should make sure to drop the reference to the device
taken by of_find_device_by_node() when returning error.

Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Peng Hao 2019-02-13 22:53:29 +08:00 committed by Eduardo Valentin
parent 76b1ae8698
commit a245b62be3
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/thermal/qcom/tsens-common.c
View file

@ -144,13 +144,17 @@ int __init init_common(struct tsens_device *tmdev)
tmdev->tm_offset = 0; tmdev->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(&op->dev, res);
if (IS_ERR(srot_base)) if (IS_ERR(srot_base)) {
return PTR_ERR(srot_base); ret = PTR_ERR(srot_base);
goto err_put_device;
}
tmdev->srot_map = devm_regmap_init_mmio(tmdev->dev, srot_base, tmdev->srot_map = devm_regmap_init_mmio(tmdev->dev, srot_base,
&tsens_srot_config); &tsens_srot_config);
if (IS_ERR(tmdev->srot_map)) if (IS_ERR(tmdev->srot_map)) {
return PTR_ERR(tmdev->srot_map); ret = PTR_ERR(tmdev->srot_map);
goto err_put_device;
}
} else { } else {
/* old DTs where SROT and TM were in a contiguous 2K block */ /* old DTs where SROT and TM were in a contiguous 2K block */
@ -159,22 +163,31 @@ int __init init_common(struct tsens_device *tmdev)
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(&op->dev, res);
if (IS_ERR(tm_base)) if (IS_ERR(tm_base)) {
return PTR_ERR(tm_base); ret = PTR_ERR(tm_base);
goto err_put_device;
}
tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base, &tsens_config); tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base, &tsens_config);
if (IS_ERR(tmdev->tm_map)) if (IS_ERR(tmdev->tm_map)) {
return PTR_ERR(tmdev->tm_map); ret = PTR_ERR(tmdev->tm_map);
goto err_put_device;
}
if (tmdev->srot_map) { if (tmdev->srot_map) {
ret = regmap_read(tmdev->srot_map, ctrl_offset, &code); ret = regmap_read(tmdev->srot_map, ctrl_offset, &code);
if (ret) if (ret)
return ret; goto err_put_device;
if (!(code & TSENS_EN)) { if (!(code & TSENS_EN)) {
dev_err(tmdev->dev, "tsens device is not enabled\n"); dev_err(tmdev->dev, "tsens device is not enabled\n");
return -ENODEV; ret = -ENODEV;
goto err_put_device;
} }
} }
return 0; return 0;
err_put_device:
put_device(&op->dev);
return ret;
} }