summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-07-10 09:42:46 +0200
committerJean Delvare <khali@linux-fr.org>2010-07-10 09:42:46 +0200
commit827900c55665dc8e20b05bb18d3f6e078eaa6183 (patch)
tree11777ea285278026d01a1f84751e6b52dd6d4521 /drivers/i2c
parente467e104bb7482170b79f516d2025e7cfcaaa733 (diff)
downloadlinux-827900c55665dc8e20b05bb18d3f6e078eaa6183.tar.gz
linux-827900c55665dc8e20b05bb18d3f6e078eaa6183.tar.bz2
linux-827900c55665dc8e20b05bb18d3f6e078eaa6183.zip
i2c: Fix probability check
The new unified probing function differs from the original code, and the preliminary test whether probing is possible must be updated accordingly. Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/i2c-core.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 1cca2631e5b3..0815e10da7c6 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1428,13 +1428,12 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
if (!(adapter->class & driver->class))
goto exit_free;
- /* Stop here if we can't use SMBUS_QUICK */
- if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
+ /* Stop here if the bus doesn't support probing */
+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE)) {
if (address_list[0] == I2C_CLIENT_END)
goto exit_free;
- dev_warn(&adapter->dev, "SMBus Quick command not supported, "
- "can't probe for chips\n");
+ dev_warn(&adapter->dev, "Probing not supported\n");
err = -EOPNOTSUPP;
goto exit_free;
}