Add cmpxchg_local to asm-generic for per cpu atomic operations

[safe/jmp/linux-2.6] / include / media / v4l2-i2c-drv-legacy.h

diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h
index c059b32..e764557 100644 (file)
--- a/include/media/v4l2-i2c-drv-legacy.h
+++ b/include/media/v4l2-i2c-drv-legacy.h
@@ -29,11 +29,12 @@ struct v4l2_i2c_driver_data {
        int (*remove)(struct i2c_client *client);
        int (*suspend)(struct i2c_client *client, pm_message_t state);
        int (*resume)(struct i2c_client *client);
+       int (*legacy_probe)(struct i2c_adapter *adapter);
        int legacy_class;
 };
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static struct i2c_client_address_data addr_data;
+static const struct i2c_client_address_data addr_data;
 static struct i2c_driver v4l2_i2c_driver_legacy;
 static char v4l2_i2c_drv_name_legacy[32];
 
@@ -45,6 +46,11 @@ static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address,
 
 static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
 {
+       if (v4l2_i2c_data.legacy_probe) {
+               if (v4l2_i2c_data.legacy_probe(adapter))
+                       return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
+               return 0;
+       }
        if (adapter->class & v4l2_i2c_data.legacy_class)
                return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
        return 0;
@@ -52,12 +58,14 @@ static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
 
 static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
 {
-       int err = i2c_detach_client(client);
+       int err;
 
-       if (err)
-               return err;
        if (v4l2_i2c_data.remove)
                v4l2_i2c_data.remove(client);
+
+       err = i2c_detach_client(client);
+       if (err)
+               return err;
        kfree(client);
 
        return 0;