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

Commit bdbf4a29 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Wolfram Sang
Browse files

i2c: muxes: fix leaked i2c adapter device node references 



Every call of of_parse_phandle() increments user count of found device
node, if OF_DYNAMIC is enabled.

The change fixes all similar addressed cases in drivers/i2c.

Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 3fffd128

drivers/i2c/muxes/i2c-arb-gpio-challenge.c

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ static int i2c_arbitrator_probe(struct platform_device *pdev) 
		return -EINVAL;

	}

	arb->parent = of_get_i2c_adapter_by_node(parent_np);

	of_node_put(parent_np);

	if (!arb->parent) {

		dev_err(dev, "Cannot find parent bus\n");

		return -EPROBE_DEFER;

drivers/i2c/muxes/i2c-mux-gpio.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, 
		return -ENODEV;

	}

	adapter = of_find_i2c_adapter_by_node(adapter_np);

	of_node_put(adapter_np);

	if (!adapter)

		return -EPROBE_DEFER;

drivers/i2c/muxes/i2c-mux-pinctrl.c

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux, 
		return -ENODEV;

	}

	adapter = of_find_i2c_adapter_by_node(adapter_np);

	of_node_put(adapter_np);

	if (!adapter) {

		dev_err(mux->dev, "Cannot find parent bus\n");

		return -EPROBE_DEFER;

drivers/i2c/muxes/i2c-mux-reg.c

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static int i2c_mux_reg_probe_dt(struct regmux *mux, 
		return -ENODEV;

	}

	adapter = of_find_i2c_adapter_by_node(adapter_np);

	of_node_put(adapter_np);

	if (!adapter)

		return -EPROBE_DEFER;