i2c: Fix probability check
authorJean Delvare <khali@linux-fr.org>
Sat, 10 Jul 2010 07:42:46 +0000 (09:42 +0200)
committerJean Delvare <khali@linux-fr.org>
Sat, 10 Jul 2010 07:42:46 +0000 (09:42 +0200)
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>
drivers/i2c/i2c-core.c

index 1cca2631e5b3bc8331062617a68968006a9fd06e..0815e10da7c6da3b5ed4974cdb505fc848c43d87 100644 (file)
@@ -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;
        }