1 From 5b007183d51543624bc9f582966f245a64157b57 Mon Sep 17 00:00:00 2001
2 From: Sakari Ailus <sakari.ailus@nokia.com>
3 Date: Fri, 31 Oct 2008 11:51:30 +0200
4 Subject: [PATCH] V4L: Int if: v4l2_int_device_try_attach_all requires mutex
6 Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
8 drivers/media/video/v4l2-int-device.c | 12 ++++++++++--
9 1 files changed, 10 insertions(+), 2 deletions(-)
11 diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/video/v4l2-int-device.c
12 index a935bae..eb8dc84 100644
13 --- a/drivers/media/video/v4l2-int-device.c
14 +++ b/drivers/media/video/v4l2-int-device.c
16 static DEFINE_MUTEX(mutex);
17 static LIST_HEAD(int_list);
19 -void v4l2_int_device_try_attach_all(void)
20 +static void __v4l2_int_device_try_attach_all(void)
22 struct v4l2_int_device *m, *s;
24 @@ -66,6 +66,14 @@ void v4l2_int_device_try_attach_all(void)
29 +void v4l2_int_device_try_attach_all(void)
32 + __v4l2_int_device_try_attach_all();
33 + mutex_unlock(&mutex);
36 EXPORT_SYMBOL_GPL(v4l2_int_device_try_attach_all);
38 static int ioctl_sort_cmp(const void *a, const void *b)
39 @@ -89,7 +97,7 @@ int v4l2_int_device_register(struct v4l2_int_device *d)
40 &ioctl_sort_cmp, NULL);
42 list_add(&d->head, &int_list);
43 - v4l2_int_device_try_attach_all();
44 + __v4l2_int_device_try_attach_all();