Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dfa3c9d authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

Input: raspberrypi-ts - fix refcount leak in rpi_ts_probe 



[ Upstream commit 5bca3688bdbc3b58a2894b8671a8e2378efe28bd ]

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: 0b9f28fe ("Input: add official Raspberry Pi's touchscreen driver")
Fixes: 3b8ddff780b7 ("input: raspberrypi-ts: Release firmware handle when not needed")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarMattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20221223074657.810346-1-linmq006@gmail.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ce6c42f0

drivers/input/touchscreen/raspberrypi-ts.c

+1 −2
Original line number Diff line number Diff line
@@ -137,7 +137,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;
@@ -164,7 +164,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;