Input: raspberrypi-ts - fix refcount leak in rpi_ts_probe
[ Upstream commit5bca3688bd
] rpi_firmware_get() take reference, we need to release it in error paths as well. Use devm_rpi_firmware_get() helper to handling the resources. Also remove the existing rpi_firmware_put(). Fixes:0b9f28fed3
("Input: add official Raspberry Pi's touchscreen driver") Fixes:3b8ddff780
("input: raspberrypi-ts: Release firmware handle when not needed") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Link: https://lore.kernel.org/r/20221223074657.810346-1-linmq006@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
b6157a9f0f
Коммит
7acad58049
|
@ -134,7 +134,7 @@ static int rpi_ts_probe(struct platform_device *pdev)
|
|||
return -ENOENT;
|
||||
}
|
||||
|
||||
fw = rpi_firmware_get(fw_node);
|
||||
fw = devm_rpi_firmware_get(&pdev->dev, fw_node);
|
||||
of_node_put(fw_node);
|
||||
if (!fw)
|
||||
return -EPROBE_DEFER;
|
||||
|
@ -160,7 +160,6 @@ static int rpi_ts_probe(struct platform_device *pdev)
|
|||
touchbuf = (u32)ts->fw_regs_phys;
|
||||
error = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF,
|
||||
&touchbuf, sizeof(touchbuf));
|
||||
rpi_firmware_put(fw);
|
||||
if (error || touchbuf != 0) {
|
||||
dev_warn(dev, "Failed to set touchbuf, %d\n", error);
|
||||
return error;
|
||||
|
|
Загрузка…
Ссылка в новой задаче