Commit 59227a81 authored by Ian Campbell's avatar Ian Campbell Committed by Greg Kroah-Hartman

[PATCH] I2C: i2c-algo-bit should support I2C_FUNC_I2C

Signed-off-by: default avatarIan Campbell <icampbell@arcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent ed6579b1
...@@ -189,7 +189,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, ...@@ -189,7 +189,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
state = pca_status(adap); state = pca_status(adap);
if ( state != 0xF8 ) { if ( state != 0xF8 ) {
printk(KERN_ERR DRIVER ": bus is not idle. status is %#04x\n", state ); dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state );
/* FIXME: what to do. Force stop ? */ /* FIXME: what to do. Force stop ? */
return -EREMOTEIO; return -EREMOTEIO;
} }
...@@ -328,7 +328,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, ...@@ -328,7 +328,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
static u32 pca_func(struct i2c_adapter *adap) static u32 pca_func(struct i2c_adapter *adap)
{ {
return I2C_FUNC_SMBUS_EMUL; return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
} }
static int pca_init(struct i2c_algo_pca_data *adap) static int pca_init(struct i2c_algo_pca_data *adap)
......
...@@ -414,8 +414,8 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, ...@@ -414,8 +414,8 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
static u32 pcf_func(struct i2c_adapter *adap) static u32 pcf_func(struct i2c_adapter *adap)
{ {
return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
I2C_FUNC_PROTOCOL_MANGLING; I2C_FUNC_10BIT_ADDR | I2C_FUNC_PROTOCOL_MANGLING;
} }
/* -----exported algorithm data: ------------------------------------- */ /* -----exported algorithm data: ------------------------------------- */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment