CGroup API files: move "releasable" to cgroup_debug subsystem

[linux-2.6-omap-h63xx.git] / 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 433c984eefa5fa3110ecf1607b3f3603a837b2a9..e7645578fc22dbb87e817a810d3184c8f8a45d96 100644 (file)
--- a/include/media/v4l2-i2c-drv-legacy.h
+++ b/include/media/v4l2-i2c-drv-legacy.h
@@ -34,7 +34,7 @@ struct v4l2_i2c_driver_data {
 };
 
 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];
 
@@ -58,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;