summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 14:50:32 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 14:50:32 -0300
commite92f78bc63e71d1572225b93b4ea0c31e6e6efc0 (patch)
treebccc2c7dde50ddbe26b96fab474731c0af82f7c4 /linux/drivers/media/video/bt8xx/bttv-driver.c
parentb47d82cb176427c78627d8791cc1361be9c0e971 (diff)
downloadmediapointer-dvb-s2-e92f78bc63e71d1572225b93b4ea0c31e6e6efc0.tar.gz
mediapointer-dvb-s2-e92f78bc63e71d1572225b93b4ea0c31e6e6efc0.tar.bz2
backout changeset e30f9c367fabf6227e17c5191c62f886d55eb2d7
From: Mauro Carvalho Chehab <mchehab@infradead.org> Unfortunately, this patch were mixed with an experimental patch I'm working with. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-driver.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c
index 86aa590b3..bb9ad09f8 100644
--- a/linux/drivers/media/video/bt8xx/bttv-driver.c
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c
@@ -3311,7 +3311,6 @@ static int bttv_open(struct inode *inode, struct file *file)
sizeof(struct bttv_buffer),
fh);
set_tvnorm(btv,btv->tvnorm);
- set_input(btv, btv->input, btv->tvnorm);
btv->users++;
@@ -3372,10 +3371,6 @@ static int bttv_release(struct inode *inode, struct file *file)
btv->users--;
bttv_field_count(btv);
-
- if (!btv->users)
- audio_mute(btv, 1);
-
return 0;
}