diff options
| author | Pantelis Antoniou <pantelis.antoniou@konsulko.com> | 2015-01-15 20:33:18 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-20 23:41:32 +0900 |
| commit | f01c984756914ac778cddab9bb0954a6f454fd12 (patch) | |
| tree | fe8af127138d1d913de5fe527df853db59268afb | |
| parent | a45e4e42eed3e70da7adc867a881af80d6fd6cc5 (diff) | |
i2c: Mark instantiated device nodes with OF_POPULATE
Mark (and unmark) device nodes with the POPULATE flag as appropriate.
This is required to avoid multi probing when using I2C and device
overlays containing a mux.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 6d0a0d9ad09be16e3ca676b245643945b4bff47d)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
drivers/i2c/i2c-core.c
| -rw-r--r-- | drivers/i2c/i2c-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 7ac0a84a2e89..435403c85b1b 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -723,8 +723,10 @@ EXPORT_SYMBOL_GPL(i2c_new_device); */ void i2c_unregister_device(struct i2c_client *client) { +#if IS_ENABLED(CONFIG_OF_DYNAMIC) if (client->dev.of_node) of_node_clear_flag(client->dev.of_node, OF_POPULATED); +#endif device_unregister(&client->dev); } EXPORT_SYMBOL_GPL(i2c_unregister_device); |