[PATCH] i2c: immediately mark ourselves as registered

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Wolfram Sang <wsa@the-dreams.de>
Newsgroups	linux.kernel
Subject	[PATCH] i2c: immediately mark ourselves as registered
Date	Mon, 14 Mar 2016 11:00:01 +0100
Message-ID	<rcxs5-22b-9@gated-at.bofh.it> (permalink)
X-Mailer	git-send-email 2.7.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	35
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Sudip Mukherjee <sudipm.mukherjee@gmail.com>, Wolfram Sang <wsa@the-dreams.de>, Thierry Reding <thierry.reding@gmail.com>
X-Original-Date	Mon, 14 Mar 2016 10:53:26 +0100
X-Original-Message-ID	<1457949206-7226-1-git-send-email-wsa@the-dreams.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1357108

Show key headers only | View raw

Mark the i2c bus as registered right after the the bus_register call,
not at the end of init. Otherwise, we can't register our own dummy
driver.

Reported-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Fixes: 95026658c46ea2 ("i2c: do not use internal data from driver core")
---
 drivers/i2c/i2c-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index f4726cdbb06a1e..f267b238c6730c 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -2105,6 +2105,9 @@ static int __init i2c_init(void)
 	retval = bus_register(&i2c_bus_type);
 	if (retval)
 		return retval;
+
+	is_registered = true;
+
 #ifdef CONFIG_I2C_COMPAT
 	i2c_adapter_compat_class = class_compat_register("i2c-adapter");
 	if (!i2c_adapter_compat_class) {
@@ -2119,7 +2122,6 @@ static int __init i2c_init(void)
 	if (IS_ENABLED(CONFIG_OF_DYNAMIC))
 		WARN_ON(of_reconfig_notifier_register(&i2c_of_notifier));
 
-	is_registered = true;
 	return 0;
 
 class_err:
-- 
2.7.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] i2c: immediately mark ourselves as registered Wolfram Sang <wsa@the-dreams.de> - 2016-03-14 11:00 +0100
  Re: [PATCH] i2c: immediately mark ourselves as registered Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-03-14 15:20 +0100
    Re: [PATCH] i2c: immediately mark ourselves as registered Wolfram Sang <wsa@the-dreams.de> - 2016-03-14 16:00 +0100
      Re: [PATCH] i2c: immediately mark ourselves as registered Nicolai Stange <nicstange@gmail.com> - 2016-03-15 00:30 +0100

csiph-web