i2c: Fix probability check

PATCH New Jean Delvare 1 participant 1 message Jun 17, 2010

Subsystems (2)

I2C subsystem host drivers I2C

lore

Share & tools

lore

Jean Delvare

author

2010-06-17 11:04 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
It would probably make more sense to skip this test altogether and make i2c_default_probe() more robust, but this quick fix will do for 2.6.35 meanwhile.

 drivers/i2c/i2c-core.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

drivers/i2c/i2c-core.c +3 -4

@@ -1428,13 +1428,12 @@ static int i2c_detect(struct i2c_adapter
 	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(adap, 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;
 	}

Signature · 1 line

Jean Delvare