Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / media / video / v4l2-common.c

diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 34deb68ae568fdb910f2d833b1e146a08cad9fdd..e9dd996fd5df1f6084930345b076e95a12d16941 100644 (file)
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -710,13 +710,14 @@ EXPORT_SYMBOL(v4l2_chip_ident_i2c_client);
 /* Helper function for I2C legacy drivers */
 
 int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver,
-               const char *name, int (*probe)(struct i2c_client *))
+               const char *name,
+               int (*probe)(struct i2c_client *, const struct i2c_device_id *))
 {
        struct i2c_client *client;
        int err;
 
        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (client == 0)
+       if (!client)
                return -ENOMEM;
 
        client->addr = address;
@@ -724,7 +725,7 @@ int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver
        client->driver = driver;
        strlcpy(client->name, name, sizeof(client->name));
 
-       err = probe(client);
+       err = probe(client, NULL);
        if (err == 0) {
                i2c_attach_client(client);
        } else {