[PATCH] fix Bug 4395: modprobe bttv freezes the computer

\r)

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>

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index abce874e71cc69ad88d8666bda5fde34df7a4fdd..85224b90e394643ef40e18deaa146867ae47105f 100644 (file)
--- 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)
         }
        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)