diff options
author | Michael Krufky <mkrufky@m1k.net> | 2005-07-27 14:45:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:16 -0400 |
commit | 7fd0f3acfa7dfc6e8aba7ce1639b8590ddb98fea (patch) | |
tree | 2c0c0ff117ebb3d5358d4a13c7f65268abdcf63f /drivers | |
parent | b96d611f373b2cbf5ffc093d859b3a9b1009e096 (diff) |
[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: 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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/bttv-cards.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 2dbf5ec43abd..6c52fd0bb7df 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | $Id: bttv-cards.c,v 1.53 2005/07/05 17:37:35 nsh Exp $ | 2 | $Id: bttv-cards.c,v 1.54 2005/07/19 18:26:46 mkrufky Exp $ |
3 | 3 | ||
4 | bttv-cards.c | 4 | bttv-cards.c |
5 | 5 | ||
@@ -2772,8 +2772,6 @@ void __devinit bttv_init_card2(struct bttv *btv) | |||
2772 | } | 2772 | } |
2773 | btv->pll.pll_current = -1; | 2773 | btv->pll.pll_current = -1; |
2774 | 2774 | ||
2775 | bttv_reset_audio(btv); | ||
2776 | |||
2777 | /* tuner configuration (from card list / autodetect / insmod option) */ | 2775 | /* tuner configuration (from card list / autodetect / insmod option) */ |
2778 | if (UNSET != bttv_tvcards[btv->c.type].tuner_type) | 2776 | if (UNSET != bttv_tvcards[btv->c.type].tuner_type) |
2779 | if(UNSET == btv->tuner_type) | 2777 | if(UNSET == btv->tuner_type) |