Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / drivers / i2c / i2c-core-base.c

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index ae3af73..6074665 100644 (file)
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -114,6 +114,25 @@ const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
 }
 EXPORT_SYMBOL_GPL(i2c_match_id);
 
+const void *i2c_get_match_data(const struct i2c_client *client)
+{
+       struct i2c_driver *driver = to_i2c_driver(client->dev.driver);
+       const struct i2c_device_id *match;
+       const void *data;
+
+       data = device_get_match_data(&client->dev);
+       if (!data) {
+               match = i2c_match_id(driver->id_table, client);
+               if (!match)
+                       return NULL;
+
+               data = (const void *)match->driver_data;
+       }
+
+       return data;
+}
+EXPORT_SYMBOL(i2c_get_match_data);
+
 static int i2c_device_match(struct device *dev, struct device_driver *drv)
 {
        struct i2c_client       *client = i2c_verify_client(dev);