Commit c680eed5 authored Jan 16, 2015 by Dmitry Torokhov Committed by Wolfram Sang Jan 26, 2015

i2c: do not try to load modules for of-registered devices

Trying to register an I2C device asynchronously (via async_schedule() call)
results in an ugly warning from request_module() warning about potential
deadlock (because request_module tries to wait for async works to
complete). While we could try to switch to request_module_nowait(), other
buses, as well as I2C itself when not using device tree, do not try to load
modules, but rather rely on the standard infrastructure (udev) to execute
module loading, and we should be doing the same.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

parent 894acb2f

drivers/i2c/i2c-core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1291,8 +1291,6 @@ static struct i2c_client of_i2c_register_device(struct i2c_adapter adap,
		if (of_get_property(node, "wakeup-source", NULL))
		info.flags \|= I2C_CLIENT_WAKE;

		request_module("%s%s", I2C_MODULE_PREFIX, info.type);

		result = i2c_new_device(adap, &info);
		if (result == NULL) {
		dev_err(&adap->dev, "of_i2c: Failure registering %s\n",

Admin message