aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorVikram Pandita <vikram.pandita@ti.com>2011-09-11 23:55:23 -0700
committerSuman Anna <s-anna@ti.com>2011-09-12 13:30:28 -0500
commit3af161981bc1df6ad68b6d3a34f09ed505cbbfe0 (patch)
tree500ade5e43f85b4fa6051062bd6c7674ca08dc5a /drivers/i2c
parentb0ed5170e36453c714e7a16b309126c3709ec02a (diff)
downloadkernel_samsung_espresso10-3af161981bc1df6ad68b6d3a34f09ed505cbbfe0.tar.gz
kernel_samsung_espresso10-3af161981bc1df6ad68b6d3a34f09ed505cbbfe0.tar.bz2
kernel_samsung_espresso10-3af161981bc1df6ad68b6d3a34f09ed505cbbfe0.zip
i2c: fix compile break when debug enabled
Fix this compile break when enable debug or compile with omap2plus_defconfig: drivers/i2c/i2c-core.c: In function 'i2c_detect_ext_master': drivers/i2c/i2c-core.c:1155: error: initializer element is not constant drivers/i2c/i2c-core.c:1155: error: (near initialization for 'descriptor.format') drivers/i2c/i2c-core.c:1155: warning: passing argument 2 of 'dev_printk' from incompatible pointer type include/linux/device.h:788: note: expected 'const struct device *' but argument is of type 'char *' make[2]: *** [drivers/i2c/i2c-core.o] Error 1 Change-Id: I9648c3d4a5f420cf71544b567ec58f49323abe7e Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/i2c-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 49ae5a5f301..d0ec08f65a2 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1152,8 +1152,8 @@ void i2c_detect_ext_master(struct i2c_adapter *adap)
mutex_lock(&adap->ext_clients_lock);
list_for_each_entry(client, &adap->ext_clients,
detected) {
- dev_dbg("Client detected %s at 0x%x\n", client->name,
- client->addr);
+ dev_dbg(&adap->dev, "Client detected %s at 0x%x\n",
+ client->name, client->addr);
disable_irq(client->irq);
}
mutex_unlock(&adap->ext_clients_lock);