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

Commit 906bf7da authored by Johan Hovold's avatar Johan Hovold Committed by Dmitry Torokhov
Browse files

Input: 88pm860x-ts - fix child-node lookup 



Fix child node-lookup during probe, which ended up searching the whole
device tree depth-first starting at parent rather than just matching on
its children.

To make things worse, the parent node was prematurely freed, while the
child node was leaked.

Fixes: 2e57d567 ("mfd: 88pm860x: Device tree support")
Cc: stable <stable@vger.kernel.org>     # 3.7
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent dcaf12a8

drivers/input/touchscreen/88pm860x-ts.c

+12 −4
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int pm860x_touch_dt_init(struct platform_device *pdev, 
	int data, n, ret;

	if (!np)

		return -ENODEV;

	np = of_find_node_by_name(np, "touch");

	np = of_get_child_by_name(np, "touch");

	if (!np) {

		dev_err(&pdev->dev, "Can't find touch node\n");

		return -EINVAL;
@@ -144,13 +144,13 @@ static int pm860x_touch_dt_init(struct platform_device *pdev, 
	if (data) {

		ret = pm860x_reg_write(i2c, PM8607_GPADC_MISC1, data);

		if (ret < 0)

			return -EINVAL;

			goto err_put_node;

	}

	/* set tsi prebias time */

	if (!of_property_read_u32(np, "marvell,88pm860x-tsi-prebias", &data)) {

		ret = pm860x_reg_write(i2c, PM8607_TSI_PREBIAS, data);

		if (ret < 0)

			return -EINVAL;

			goto err_put_node;

	}

	/* set prebias & prechg time of pen detect */

	data = 0;
@@ -161,10 +161,18 @@ static int pm860x_touch_dt_init(struct platform_device *pdev, 
	if (data) {

		ret = pm860x_reg_write(i2c, PM8607_PD_PREBIAS, data);

		if (ret < 0)

			return -EINVAL;

			goto err_put_node;

	}

	of_property_read_u32(np, "marvell,88pm860x-resistor-X", res_x);



	of_node_put(np);



	return 0;



err_put_node:

	of_node_put(np);



	return -EINVAL;

}

#else

#define pm860x_touch_dt_init(x, y, z)	(-1)