From 17c32f6859507a88716a208a3f83295087456673 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Tue, 19 Jul 2005 18:26:46 +0000 Subject: * bttv-cards.c: - Fix Bug 4395: modprobe bttv freezes the computer http://bugme.osdl.org/show_bug.cgi?id=4395. Date: Wed, 13 Apr 2005 03:20:08 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. This patch must have gotten lost during the orphaned v4l days... Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Michael Krufky --- linux/drivers/media/video/bttv-cards.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index b89f6cb2f..d60e56bee 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.53 2005/07/05 17:37:35 nsh Exp $ + $Id: bttv-cards.c,v 1.54 2005/07/19 18:26:46 mkrufky Exp $ bttv-cards.c @@ -2813,8 +2813,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) -- cgit v1.2.3