Skip to content

Commit

Permalink
[PATCH] v4l: fix regression modprobe bttv freezes the computer
Browse files Browse the repository at this point in the history
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: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Michael Krufky authored and Linus Torvalds committed Jul 27, 2005
1 parent b96d611 commit 7fd0f3a
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/media/video/bttv-cards.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -2772,8 +2772,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)
Expand Down

0 comments on commit 7fd0f3a

Please sign in to comment.