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-maestro.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-maestro.c')
-rw-r--r-- | drivers/media/radio/radio-maestro.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index 9ef0a763eeb7..03c20948eef2 100644 --- a/drivers/media/radio/radio-maestro.c +++ b/drivers/media/radio/radio-maestro.c | |||
@@ -75,7 +75,21 @@ static struct v4l2_queryctrl radio_qctrl[] = { | |||
75 | static int radio_nr = -1; | 75 | static int radio_nr = -1; |
76 | module_param(radio_nr, int, 0); | 76 | module_param(radio_nr, int, 0); |
77 | 77 | ||
78 | static unsigned long in_use; | ||
79 | |||
78 | static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent); | 80 | static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
81 | |||
82 | static int maestro_exclusive_open(struct inode *inode, struct file *file) | ||
83 | { | ||
84 | return test_and_set_bit(0, &in_use) ? -EBUSY : 0; | ||
85 | } | ||
86 | |||
87 | static int maestro_exclusive_release(struct inode *inode, struct file *file) | ||
88 | { | ||
89 | clear_bit(0, &in_use); | ||
90 | return 0; | ||
91 | } | ||
92 | |||
79 | static void maestro_remove(struct pci_dev *pdev); | 93 | static void maestro_remove(struct pci_dev *pdev); |
80 | 94 | ||
81 | static struct pci_device_id maestro_r_pci_tbl[] = { | 95 | static struct pci_device_id maestro_r_pci_tbl[] = { |
@@ -98,8 +112,8 @@ static struct pci_driver maestro_r_driver = { | |||
98 | 112 | ||
99 | static const struct file_operations maestro_fops = { | 113 | static const struct file_operations maestro_fops = { |
100 | .owner = THIS_MODULE, | 114 | .owner = THIS_MODULE, |
101 | .open = video_exclusive_open, | 115 | .open = maestro_exclusive_open, |
102 | .release = video_exclusive_release, | 116 | .release = maestro_exclusive_release, |
103 | .ioctl = video_ioctl2, | 117 | .ioctl = video_ioctl2, |
104 | #ifdef CONFIG_COMPAT | 118 | #ifdef CONFIG_COMPAT |
105 | .compat_ioctl = v4l_compat_ioctl32, | 119 | .compat_ioctl = v4l_compat_ioctl32, |