Commit 7fd0f3ac authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds

[PATCH] v4l: fix regression modprobe bttv freezes the computer

Remove redundant bttv_reset_audio() which caused the computer to freeze
with some bt8xx based DVB cards when loading the bttv driver.
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b96d611f
/* /*
$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 bttv-cards.c
...@@ -2772,8 +2772,6 @@ void __devinit bttv_init_card2(struct bttv *btv) ...@@ -2772,8 +2772,6 @@ void __devinit bttv_init_card2(struct bttv *btv)
} }
btv->pll.pll_current = -1; btv->pll.pll_current = -1;
bttv_reset_audio(btv);
/* tuner configuration (from card list / autodetect / insmod option) */ /* tuner configuration (from card list / autodetect / insmod option) */
if (UNSET != bttv_tvcards[btv->c.type].tuner_type) if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
if(UNSET == btv->tuner_type) if(UNSET == btv->tuner_type)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment