---

yaml
---
r: 10599
b: refs/heads/master
c: 4366dc9
h: refs/heads/master
i:
  10597: 0fdffb6
  10595: 2ddb1e9
  10591: 9003d08
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb929eae78ec0b243dbf58039bce4af354f6020c
+refs/heads/master: 4366dc946c01305cff49b07dabb806d2364f1edb

trunk/drivers/i2c/i2c-core.c

@@ -706,10 +706,6 @@ int i2c_probe(struct i2c_adapter *adapter,
 	int i, err;
 	int adap_id = i2c_adapter_id(adapter);
 
-	/* Forget it if we can't probe using SMBUS_QUICK */
-	if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
-		return -1;
-
 	/* Force entries are done first, and are not affected by ignore
 	   entries */
 	if (address_data->forces) {
@@ -736,6 +732,17 @@ int i2c_probe(struct i2c_adapter *adapter,
 		}
 	}
 
+	/* Stop here if we can't use SMBUS_QUICK */
+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
+		if (address_data->probe[0] == I2C_CLIENT_END
+		 && address_data->normal_i2c[0] == I2C_CLIENT_END)
+		 	return 0;
+
+		dev_warn(&adapter->dev, "SMBus Quick command not supported, "
+			 "can't probe for chips\n");
+		return -1;
+	}
+
 	/* Probe entries are done second, and are not affected by ignore
 	   entries either */
 	for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {