Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933773AbcJQOAe (ORCPT ); Mon, 17 Oct 2016 10:00:34 -0400 Received: from ramses-pyramidenbau.de ([37.120.178.10]:43058 "EHLO mail.ramses-pyramidenbau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933239AbcJQOAK (ORCPT ); Mon, 17 Oct 2016 10:00:10 -0400 From: Ralf Ramsauer To: Mark Brown , Geert Uytterhoeven , Wolfram Sang , Linux SPI , Linux I2C Cc: Ralf Ramsauer , "linux-kernel @ vger . kernel . org" , Pantelis Antoniou Subject: [PATCH v2 2/2] i2c: mark device nodes only in case of successful instantiation Date: Mon, 17 Oct 2016 15:59:57 +0200 Message-Id: <20161017135957.20297-3-ralf@ramses-pyramidenbau.de> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161017135957.20297-1-ralf@ramses-pyramidenbau.de> References: <20161017135957.20297-1-ralf@ramses-pyramidenbau.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2008 Lines: 57 Instantiated I2C device nodes are marked with OF_POPULATE. This was introduced in 4f001fd. 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. Note that the same issue exists for SPI. Fixes: 4f001fd ("i2c: Mark instantiated device nodes with OF_POPULATE") Signed-off-by: Ralf Ramsauer --- drivers/i2c/i2c-core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 5ab6721..1704fc8 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -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; -- 2.10.1