diff options
Diffstat (limited to 'drivers/media/radio/radio-trust.c')
-rw-r--r-- | drivers/media/radio/radio-trust.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c index 193161956253..e7b111fcd105 100644 --- a/drivers/media/radio/radio-trust.c +++ b/drivers/media/radio/radio-trust.c | |||
@@ -78,6 +78,7 @@ static __u16 curtreble; | |||
78 | static unsigned long curfreq; | 78 | static unsigned long curfreq; |
79 | static int curstereo; | 79 | static int curstereo; |
80 | static int curmute; | 80 | static int curmute; |
81 | static unsigned long in_use; | ||
81 | 82 | ||
82 | /* i2c addresses */ | 83 | /* i2c addresses */ |
83 | #define TDA7318_ADDR 0x88 | 84 | #define TDA7318_ADDR 0x88 |
@@ -336,10 +337,21 @@ static int vidioc_s_audio(struct file *file, void *priv, | |||
336 | return 0; | 337 | return 0; |
337 | } | 338 | } |
338 | 339 | ||
340 | static int trust_exclusive_open(struct inode *inode, struct file *file) | ||
341 | { | ||
342 | return test_and_set_bit(0, &in_use) ? -EBUSY : 0; | ||
343 | } | ||
344 | |||
345 | static int trust_exclusive_release(struct inode *inode, struct file *file) | ||
346 | { | ||
347 | clear_bit(0, &in_use); | ||
348 | return 0; | ||
349 | } | ||
350 | |||
339 | static const struct file_operations trust_fops = { | 351 | static const struct file_operations trust_fops = { |
340 | .owner = THIS_MODULE, | 352 | .owner = THIS_MODULE, |
341 | .open = video_exclusive_open, | 353 | .open = trust_exclusive_open, |
342 | .release = video_exclusive_release, | 354 | .release = trust_exclusive_release, |
343 | .ioctl = video_ioctl2, | 355 | .ioctl = video_ioctl2, |
344 | #ifdef CONFIG_COMPAT | 356 | #ifdef CONFIG_COMPAT |
345 | .compat_ioctl = v4l_compat_ioctl32, | 357 | .compat_ioctl = v4l_compat_ioctl32, |
@@ -366,6 +378,7 @@ static struct video_device trust_radio = { | |||
366 | .name = "Trust FM Radio", | 378 | .name = "Trust FM Radio", |
367 | .fops = &trust_fops, | 379 | .fops = &trust_fops, |
368 | .ioctl_ops = &trust_ioctl_ops, | 380 | .ioctl_ops = &trust_ioctl_ops, |
381 | .release = video_device_release_empty, | ||
369 | }; | 382 | }; |
370 | 383 | ||
371 | static int __init trust_init(void) | 384 | static int __init trust_init(void) |