diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 10:47:17 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 10:47:17 -0200 |
commit | 9ff1adde48c80361824a2cd7117a796566ef1568 (patch) | |
tree | c37be4bf83ba80eb7d4d043ec7909d969593ad4c /linux/drivers/media/radio/radio-mr800.c | |
parent | e402bb3818ca00c2aab772674f383648dbde9f3c (diff) | |
parent | fa2c7f7072fa52468acd23336dacef719c5ca706 (diff) | |
download | mediapointer-dvb-s2-9ff1adde48c80361824a2cd7117a796566ef1568.tar.gz mediapointer-dvb-s2-9ff1adde48c80361824a2cd7117a796566ef1568.tar.bz2 |
merge: http://linuxtv.org/hg/~dougsland/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/radio/radio-mr800.c')
-rw-r--r-- | linux/drivers/media/radio/radio-mr800.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/radio/radio-mr800.c b/linux/drivers/media/radio/radio-mr800.c index 2ae8e1447..5941127a5 100644 --- a/linux/drivers/media/radio/radio-mr800.c +++ b/linux/drivers/media/radio/radio-mr800.c @@ -472,16 +472,21 @@ static int usb_amradio_open(struct inode *inode, struct file *file) { struct amradio_device *radio = video_get_drvdata(video_devdata(file)); + lock_kernel(); + radio->users = 1; radio->muted = 1; if (amradio_start(radio) < 0) { warn("Radio did not start up properly"); radio->users = 0; + unlock_kernel(); return -EIO; } if (amradio_setfreq(radio, radio->curfreq) < 0) warn("Set frequency failed"); + + unlock_kernel(); return 0; } |