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

Commit 6a676fb6 authored by Ralf Ramsauer's avatar Ralf Ramsauer Committed by Wolfram Sang
Browse files

i2c: mark device nodes only in case of successful instantiation 



Instantiated I2C device nodes are marked with OF_POPULATE. This was
introduced in 4f001fd3. On unloading, loaded device nodes will of
course be unmarked. The problem are nodes that fail during
initialisation: If a node fails, it won't be unloaded and hence not be
unmarked.

If a I2C driver module is unloaded and reloaded, it will skip nodes that
failed before.

Skip device nodes that are already populated and mark them only in case
of success.

Fixes: 4f001fd3 ("i2c: Mark instantiated device nodes with OF_POPULATE")
Signed-off-by: default avatarRalf Ramsauer <ralf@ramses-pyramidenbau.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarPantelis Antoniou <pantelis.antoniou@konsulko.com>
[wsa: use 14-digit commit sha]
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
parent 399c168a

drivers/i2c/i2c-core.c

+10 −1
Original line number Diff line number Diff line
@@ -1681,6 +1681,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, 
static void of_i2c_register_devices(struct i2c_adapter *adap)

{

	struct device_node *bus, *node;

	struct i2c_client *client;



	/* Only register child devices if the adapter has a node pointer set */

	if (!adap->dev.of_node)
@@ -1695,7 +1696,14 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) 
	for_each_available_child_of_node(bus, node) {

		if (of_node_test_and_set_flag(node, OF_POPULATED))

			continue;

		of_i2c_register_device(adap, node);



		client = of_i2c_register_device(adap, node);

		if (IS_ERR(client)) {

			dev_warn(&adap->dev,

				 "Failed to create I2C device for %s\n",

				 node->full_name);

			of_node_clear_flag(node, OF_POPULATED);

		}

	}



	of_node_put(bus);
@@ -2299,6 +2307,7 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action, 
		if (IS_ERR(client)) {

			dev_err(&adap->dev, "failed to create client for '%s'\n",

				 rd->dn->full_name);

			of_node_clear_flag(rd->dn, OF_POPULATED);

			return notifier_from_errno(PTR_ERR(client));

		}

		break;