From 1177073e2fa141d0c01286ef7650bc07db849e5c Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 14 Oct 2008 17:30:05 +0200 Subject: [PATCH] --- yaml --- r: 114487 b: refs/heads/master c: 1d0b19c9a0612c653d1a0df267ba159089f6d139 h: refs/heads/master i: 114485: bb046cd5ee38912092840b3808f36aa362dc5184 114483: cdf3bc57410d973b73257ee907ef85b5ca575d92 114479: 98104f76e4244a59f60b5dbd63e981fe812c10b8 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-core.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8ceae021dbf5..fbf340367642 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c15fd1249658e203b2ac8661e48da6c2102e563 +refs/heads/master: 1d0b19c9a0612c653d1a0df267ba159089f6d139 diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c index b346a687ab59..a96e1bf27649 100644 --- a/trunk/drivers/i2c/i2c-core.c +++ b/trunk/drivers/i2c/i2c-core.c @@ -437,6 +437,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap) { int res = 0, dummy; + /* Can't register until after driver model init */ + if (unlikely(WARN_ON(!i2c_bus_type.p))) + return -EAGAIN; + mutex_init(&adap->bus_lock); mutex_init(&adap->clist_lock); INIT_LIST_HEAD(&adap->clients); @@ -696,6 +700,10 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver) { int res; + /* Can't register until after driver model init */ + if (unlikely(WARN_ON(!i2c_bus_type.p))) + return -EAGAIN; + /* new style driver methods can't mix with legacy ones */ if (is_newstyle_driver(driver)) { if (driver->attach_adapter || driver->detach_adapter