[PATCH] modprobe bttv freezes the computer

Here's a patch that fixes
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: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 4ee9026fc36b883e47a6645e1d5c01d9202d4236..8127a34ce4792e35ee0e9a7bd91a84abd2385dfc 100644 (file)
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -2718,8 +2718,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)