summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-07-19 18:26:46 +0000
committerMichael Krufky <devnull@localhost>2005-07-19 18:26:46 +0000
commit17c32f6859507a88716a208a3f83295087456673 (patch)
treeb27734641fcd7a54a32cb8ccc1a91c533e4502f4 /linux/drivers/media
parent38e2d167bcac541dff323644093fc214cd0b1144 (diff)
downloadmediapointer-dvb-s2-17c32f6859507a88716a208a3f83295087456673.tar.gz
mediapointer-dvb-s2-17c32f6859507a88716a208a3f83295087456673.tar.bz2
* bttv-cards.c:
- Fix Bug 4395: modprobe bttv freezes the computer http://bugme.osdl.org/show_bug.cgi?id=4395. Date: Wed, 13 Apr 2005 03:20:08 Patch by Manu Abraham and Gerd Knorr: - Remove redundant bttv_reset_audio() which caused the computer to freeze with some bt8xx based DVB cards when loading the bttv driver. This patch must have gotten lost during the orphaned v4l days... Signed-off-by: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/bttv-cards.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index b89f6cb2f..d60e56bee 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-cards.c,v 1.53 2005/07/05 17:37:35 nsh Exp $
+ $Id: bttv-cards.c,v 1.54 2005/07/19 18:26:46 mkrufky Exp $
bttv-cards.c
@@ -2813,8 +2813,6 @@ void __devinit bttv_init_card2(struct bttv *btv)
}
btv->pll.pll_current = -1;
- bttv_reset_audio(btv);
-
/* tuner configuration (from card list / autodetect / insmod option) */
if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
if(UNSET == btv->tuner_type)