diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-11-04 12:31:17 +0300 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2015-11-04 12:31:17 +0300 |
| commit | d7d2c27217f76bbe03283b169c76db812a797a6c (patch) | |
| tree | fb4742dcd1fb526fc8330f3fdff0fa2816f53c7a | |
| parent | a12833d3584a8b1208269b3ff53b8fd9e8edcbe6 (diff) | |
| parent | bd81ab1984896a1a6fac01c7f59314b05caf94de (diff) | |
| download | linux-d7d2c27217f76bbe03283b169c76db812a797a6c.tar.xz | |
Merge pull request #14 from jk-ozlabs/openbmc/i2c-fixes
Openbmc/i2c fixes
| -rw-r--r-- | drivers/i2c/busses/i2c-aspeed.c | 1 | ||||
| -rw-r--r-- | drivers/i2c/i2c-core.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c index 395e965c46a6..551d454197ac 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -1257,6 +1257,7 @@ static int aspeed_i2c_add_bus(struct device_node *np, bus->adap.algo = &i2c_ast_algorithm; bus->adap.algo_data = bus; bus->adap.dev.parent = &pdev->dev; + bus->adap.dev.of_node = np; snprintf(bus->adap.name, sizeof(bus->adap.name), "Aspeed i2c at %p", bus->base); diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index c83e4d13cfc5..de2c22bd0399 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -496,7 +496,6 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) if (add_uevent_var(env, "MODALIAS=%s%s", I2C_MODULE_PREFIX, client->name)) return -ENOMEM; - dev_dbg(dev, "uevent\n"); return 0; } |