aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-16 03:07:22 -0500
committerWolfram Sang <wsa@the-dreams.de>2015-01-26 10:52:51 -0500
commitc680eed5ccd4a1c99ee48cd41f4e5fdfad497dc2 (patch)
tree35f203b097acdd6f41b8c2b2b78f21e207f90c42
parent894acb2f823b13afacfe40b02efbd9146af58586 (diff)
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>
-rw-r--r--drivers/i2c/i2c-core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 7730a68fa2d0..72d53e40ebab 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1291,8 +1291,6 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
1291 if (of_get_property(node, "wakeup-source", NULL)) 1291 if (of_get_property(node, "wakeup-source", NULL))
1292 info.flags |= I2C_CLIENT_WAKE; 1292 info.flags |= I2C_CLIENT_WAKE;
1293 1293
1294 request_module("%s%s", I2C_MODULE_PREFIX, info.type);
1295
1296 result = i2c_new_device(adap, &info); 1294 result = i2c_new_device(adap, &info);
1297 if (result == NULL) { 1295 if (result == NULL) {
1298 dev_err(&adap->dev, "of_i2c: Failure registering %s\n", 1296 dev_err(&adap->dev, "of_i2c: Failure registering %s\n",