From: akpm@osdl.org Date: Sat, 16 Apr 2005 22:24:02 +0000 (-0700) Subject: [PATCH] fix Bug 4395: modprobe bttv freezes the computer X-Git-Tag: v2.6.12-rc3~233 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1db7fc75a410d9a15cbc58a9b073a688669c6d42;p=linux-2.6 [PATCH] fix Bug 4395: modprobe bttv freezes the computer ) From: Johannes Stezenbach 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index abce874e71..85224b90e3 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) } 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)