summaryrefslogtreecommitdiff
path: root/linux/drivers/media/radio/radio-typhoon.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-23 09:49:13 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-08-23 09:49:13 +0200
commit550d99d78a4cb96963d19e5c234dffd6f973d55f (patch)
treecd8057d0e8a70902ac9a9e65966ec4bc11981a34 /linux/drivers/media/radio/radio-typhoon.c
parentab19cb308e86c5aeb0531bbbf5bfb2c09d3423a3 (diff)
downloadmediapointer-dvb-s2-550d99d78a4cb96963d19e5c234dffd6f973d55f.tar.gz
mediapointer-dvb-s2-550d99d78a4cb96963d19e5c234dffd6f973d55f.tar.bz2
radio: replace video_exclusive_open/release
From: Hans Verkuil <hverkuil@xs4all.nl> Move the video_exclusive_open/release functionality into the driver itself. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/radio/radio-typhoon.c')
-rw-r--r--linux/drivers/media/radio/radio-typhoon.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/linux/drivers/media/radio/radio-typhoon.c b/linux/drivers/media/radio/radio-typhoon.c
index fa66168d7..4511f144c 100644
--- a/linux/drivers/media/radio/radio-typhoon.c
+++ b/linux/drivers/media/radio/radio-typhoon.c
@@ -80,7 +80,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {
#endif
struct typhoon_device {
- int users;
+ unsigned long in_use;
int iobase;
int curvol;
int muted;
@@ -335,10 +335,21 @@ static struct typhoon_device typhoon_unit =
.mutefreq = CONFIG_RADIO_TYPHOON_MUTEFREQ,
};
+static int typhoon_exclusive_open(struct inode *inode, struct file *file)
+{
+ return test_and_set_bit(0, &typhoon_unit.in_use) ? -EBUSY : 0;
+}
+
+static int typhoon_exclusive_release(struct inode *inode, struct file *file)
+{
+ clear_bit(0, &typhoon_unit.in_use);
+ return 0;
+}
+
static const struct file_operations typhoon_fops = {
.owner = THIS_MODULE,
- .open = video_exclusive_open,
- .release = video_exclusive_release,
+ .open = typhoon_exclusive_open,
+ .release = typhoon_exclusive_release,
.ioctl = video_ioctl2,
#ifdef CONFIG_COMPAT
.compat_ioctl = v4l_compat_ioctl32,
@@ -448,8 +459,7 @@ static int __init typhoon_init(void)
}
typhoon_radio.priv = &typhoon_unit;
- if (video_register_device(&typhoon_radio, VFL_TYPE_RADIO, radio_nr) == -1)
- {
+ if (video_register_device(&typhoon_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
release_region(io, 8);
return -EINVAL;
}