diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-30 07:43:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:47 -0400 |
commit | d56dc61265d2527a63ab5b0f03199a43cd89ca36 (patch) | |
tree | bea2a5b12fc120ca6e8797b2f16ad9696e0f25dd /drivers/media/video/se401.c | |
parent | 95f73c5b57990c97047c200b8746ab62a360c5bc (diff) |
V4L/DVB (8613): v4l: move BKL down to the driver level.
The BKL is now moved from the video_open function in v4l2-dev.c to the
various drivers. It seems about a third of the drivers already has a
lock of some sort protecting the open(), another third uses
video_exclusive_open (yuck!) and the last third required adding the
BKL in their open function.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/se401.c')
-rw-r--r-- | drivers/media/video/se401.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index acceed5d04ae..d16bbf0d2783 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
@@ -936,14 +936,18 @@ static int se401_open(struct inode *inode, struct file *file) | |||
936 | struct usb_se401 *se401 = (struct usb_se401 *)dev; | 936 | struct usb_se401 *se401 = (struct usb_se401 *)dev; |
937 | int err = 0; | 937 | int err = 0; |
938 | 938 | ||
939 | if (se401->user) | 939 | lock_kernel(); |
940 | if (se401->user) { | ||
941 | unlock_kernel(); | ||
940 | return -EBUSY; | 942 | return -EBUSY; |
943 | } | ||
941 | se401->fbuf = rvmalloc(se401->maxframesize * SE401_NUMFRAMES); | 944 | se401->fbuf = rvmalloc(se401->maxframesize * SE401_NUMFRAMES); |
942 | if (se401->fbuf) | 945 | if (se401->fbuf) |
943 | file->private_data = dev; | 946 | file->private_data = dev; |
944 | else | 947 | else |
945 | err = -ENOMEM; | 948 | err = -ENOMEM; |
946 | se401->user = !err; | 949 | se401->user = !err; |
950 | unlock_kernel(); | ||
947 | 951 | ||
948 | return err; | 952 | return err; |
949 | } | 953 | } |