|
@@ -697,7 +697,7 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
|
|
|
|
|
|
|
|
|
|
/* Attempt an OF style match */
|
|
/* Attempt an OF style match */
|
|
- if (of_driver_match_device(dev, drv))
|
|
|
|
|
|
+ if (i2c_of_match_device(drv->of_match_table, client))
|
|
return 1;
|
|
return 1;
|
|
|
|
|
|
/* Then ACPI style match */
|
|
/* Then ACPI style match */
|
|
@@ -923,7 +923,15 @@ static int i2c_device_probe(struct device *dev)
|
|
}
|
|
}
|
|
|
|
|
|
driver = to_i2c_driver(dev->driver);
|
|
driver = to_i2c_driver(dev->driver);
|
|
- if (!driver->probe || !driver->id_table)
|
|
|
|
|
|
+ if (!driver->probe)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * An I2C ID table is not mandatory, if and only if, a suitable Device
|
|
|
|
+ * Tree match table entry is supplied for the probing device.
|
|
|
|
+ */
|
|
|
|
+ if (!driver->id_table &&
|
|
|
|
+ !i2c_of_match_device(dev->driver->of_match_table, client))
|
|
return -ENODEV;
|
|
return -ENODEV;
|
|
|
|
|
|
if (client->flags & I2C_CLIENT_WAKE) {
|
|
if (client->flags & I2C_CLIENT_WAKE) {
|