summaryrefslogtreecommitdiff
path: root/linux/drivers/media/radio/dsbr100.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
commitadff0f37dc0f0ab48850eaad267223c634e975a2 (patch)
treec6aa3e259581abeb64eb7590b29a60354ec5a5ee /linux/drivers/media/radio/dsbr100.c
parente2b4212172d81f17f5e4741766f032d06e83ce4f (diff)
parentf25ebd42bbb82866dfbbba5b7bfc651315fa6416 (diff)
downloadmediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.gz
mediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.bz2
merge: http://linuxtv.org/hg/~tap/bttv
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/radio/dsbr100.c')
-rw-r--r--linux/drivers/media/radio/dsbr100.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/radio/dsbr100.c b/linux/drivers/media/radio/dsbr100.c
index 0516711f8..155a75341 100644
--- a/linux/drivers/media/radio/dsbr100.c
+++ b/linux/drivers/media/radio/dsbr100.c
@@ -455,7 +455,10 @@ static int vidioc_s_frequency(struct file *file, void *priv,
if (radio->removed)
return -EIO;
+ mutex_lock(&radio->lock);
radio->curfreq = f->frequency;
+ mutex_unlock(&radio->lock);
+
retval = dsbr100_setfreq(radio, radio->curfreq);
if (retval < 0)
dev_warn(&radio->usbdev->dev, "Set frequency failed\n");
@@ -606,7 +609,10 @@ static int usb_dsbr100_close(struct file *file)
if (!radio)
return -ENODEV;
+ mutex_lock(&radio->lock);
radio->users = 0;
+ mutex_unlock(&radio->lock);
+
if (!radio->removed) {
retval = dsbr100_stop(radio);
if (retval < 0) {