Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / v4l2-int-device.c

diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/video/v4l2-int-device.c
index aa2a8156338d1aa9c2c4ea96c457a67349267763..a935bae538ef26f4455cea5f58e0bf1da2b7c159 100644 (file)
--- a/drivers/media/video/v4l2-int-device.c
+++ b/drivers/media/video/v4l2-int-device.c
@@ -32,23 +32,15 @@
 static DEFINE_MUTEX(mutex);
 static LIST_HEAD(int_list);
 
-static void v4l2_int_device_try_attach_all(void)
+void v4l2_int_device_try_attach_all(void)
 {
-       struct list_head *head_master;
-
-       list_for_each(head_master, &int_list) {
-               struct list_head *head_slave;
-               struct v4l2_int_device *m =
-                       list_entry(head_master, struct v4l2_int_device, head);
+       struct v4l2_int_device *m, *s;
 
+       list_for_each_entry(m, &int_list, head) {
                if (m->type != v4l2_int_type_master)
                        continue;
 
-               list_for_each(head_slave, &int_list) {
-                       struct v4l2_int_device *s =
-                               list_entry(head_slave,
-                                          struct v4l2_int_device, head);
-
+               list_for_each_entry(s, &int_list, head) {
                        if (s->type != v4l2_int_type_slave)
                                continue;
 
@@ -65,15 +57,16 @@ static void v4l2_int_device_try_attach_all(void)
                        if (!try_module_get(m->module))
                                continue;
 
-                       if (m->u.master->attach(m, s)) {
+                       s->u.slave->master = m;
+                       if (m->u.master->attach(s)) {
+                               s->u.slave->master = NULL;
                                module_put(m->module);
                                continue;
                        }
-
-                       s->u.slave->master = m;
                }
        }
 }
+EXPORT_SYMBOL_GPL(v4l2_int_device_try_attach_all);
 
 static int ioctl_sort_cmp(const void *a, const void *b)
 {
@@ -101,6 +94,7 @@ int v4l2_int_device_register(struct v4l2_int_device *d)
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(v4l2_int_device_register);
 
 void v4l2_int_device_unregister(struct v4l2_int_device *d)
 {
@@ -114,6 +108,7 @@ void v4l2_int_device_unregister(struct v4l2_int_device *d)
        }
        mutex_unlock(&mutex);
 }
+EXPORT_SYMBOL_GPL(v4l2_int_device_unregister);
 
 /* Adapted from search_extable in extable.c. */
 static v4l2_int_ioctl_func *find_ioctl(struct v4l2_int_slave *slave, int cmd,
@@ -141,24 +136,28 @@ static v4l2_int_ioctl_func *find_ioctl(struct v4l2_int_slave *slave, int cmd,
 
 static int no_such_ioctl_0(struct v4l2_int_device *d)
 {
-       return -EINVAL;
+       return -ENOIOCTLCMD;
 }
 
 int v4l2_int_ioctl_0(struct v4l2_int_device *d, int cmd)
 {
        return ((v4l2_int_ioctl_func_0 *)
                find_ioctl(d->u.slave, cmd,
-                          (v4l2_int_ioctl_func *)&no_such_ioctl_0))(d);
+                          (v4l2_int_ioctl_func *)no_such_ioctl_0))(d);
 }
+EXPORT_SYMBOL_GPL(v4l2_int_ioctl_0);
 
 static int no_such_ioctl_1(struct v4l2_int_device *d, void *arg)
 {
-       return -EINVAL;
+       return -ENOIOCTLCMD;
 }
 
 int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg)
 {
        return ((v4l2_int_ioctl_func_1 *)
                find_ioctl(d->u.slave, cmd,
-                          (v4l2_int_ioctl_func *)&no_such_ioctl_1))(d, arg);
+                          (v4l2_int_ioctl_func *)no_such_ioctl_1))(d, arg);
 }
+EXPORT_SYMBOL_GPL(v4l2_int_ioctl_1);
+
+MODULE_LICENSE("GPL");