diff options
| author | akpm@osdl.org <akpm@osdl.org> | 2005-04-16 18:24:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:02 -0400 |
| commit | 1db7fc75a410d9a15cbc58a9b073a688669c6d42 (patch) | |
| tree | cddd6fefd8e9895db1dfc933a5a174ec374694ec | |
| parent | 51410d3c53d85da0f24277f9580cbec1260ffc8f (diff) | |
[PATCH] fix Bug 4395: modprobe bttv freezes the computer
)
From: Johannes Stezenbach <js@linuxtv.org>
Fix http://bugme.osdl.org/show_bug.cgi?id=4395.
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.
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/video/bttv-cards.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index abce874e71cc..85224b90e394 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
| @@ -2785,8 +2785,6 @@ void __devinit bttv_init_card2(struct bttv *btv) | |||
| 2785 | } | 2785 | } |
| 2786 | btv->pll.pll_current = -1; | 2786 | btv->pll.pll_current = -1; |
| 2787 | 2787 | ||
| 2788 | bttv_reset_audio(btv); | ||
| 2789 | |||
| 2790 | /* tuner configuration (from card list / autodetect / insmod option) */ | 2788 | /* tuner configuration (from card list / autodetect / insmod option) */ |
| 2791 | if (UNSET != bttv_tvcards[btv->c.type].tuner_type) | 2789 | if (UNSET != bttv_tvcards[btv->c.type].tuner_type) |
| 2792 | if(UNSET == btv->tuner_type) | 2790 | if(UNSET == btv->tuner_type) |