diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-23 03:49:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:53 -0400 |
commit | 3ca685aae04960eaa8b2c97baf384996c20cf9ac (patch) | |
tree | a4d99449643380c62b11a05d93f81b6b8a2f82d7 /drivers/media/radio/radio-sf16fmr2.c | |
parent | 3b5df8ea40ac533c62b8e5f9f173d985665fc752 (diff) |
V4L/DVB (8776): radio: replace video_exclusive_open/release
Move the video_exclusive_open/release functionality into the driver itself.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/radio-sf16fmr2.c')
-rw-r--r-- | drivers/media/radio/radio-sf16fmr2.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c index 6290553d24be..14153ed939d0 100644 --- a/drivers/media/radio/radio-sf16fmr2.c +++ b/drivers/media/radio/radio-sf16fmr2.c | |||
@@ -64,6 +64,7 @@ static struct v4l2_queryctrl radio_qctrl[] = { | |||
64 | /* this should be static vars for module size */ | 64 | /* this should be static vars for module size */ |
65 | struct fmr2_device | 65 | struct fmr2_device |
66 | { | 66 | { |
67 | unsigned long in_use; | ||
67 | int port; | 68 | int port; |
68 | int curvol; /* 0-15 */ | 69 | int curvol; /* 0-15 */ |
69 | int mute; | 70 | int mute; |
@@ -400,10 +401,21 @@ static int vidioc_s_audio(struct file *file, void *priv, | |||
400 | 401 | ||
401 | static struct fmr2_device fmr2_unit; | 402 | static struct fmr2_device fmr2_unit; |
402 | 403 | ||
404 | static int fmr2_exclusive_open(struct inode *inode, struct file *file) | ||
405 | { | ||
406 | return test_and_set_bit(0, &fmr2_unit.in_use) ? -EBUSY : 0; | ||
407 | } | ||
408 | |||
409 | static int fmr2_exclusive_release(struct inode *inode, struct file *file) | ||
410 | { | ||
411 | clear_bit(0, &fmr2_unit.in_use); | ||
412 | return 0; | ||
413 | } | ||
414 | |||
403 | static const struct file_operations fmr2_fops = { | 415 | static const struct file_operations fmr2_fops = { |
404 | .owner = THIS_MODULE, | 416 | .owner = THIS_MODULE, |
405 | .open = video_exclusive_open, | 417 | .open = fmr2_exclusive_open, |
406 | .release = video_exclusive_release, | 418 | .release = fmr2_exclusive_release, |
407 | .ioctl = video_ioctl2, | 419 | .ioctl = video_ioctl2, |
408 | #ifdef CONFIG_COMPAT | 420 | #ifdef CONFIG_COMPAT |
409 | .compat_ioctl = v4l_compat_ioctl32, | 421 | .compat_ioctl = v4l_compat_ioctl32, |