[2.6.13 PATCH] v4l: fix regression modprobe bttv freezes the computer

[2.6.13 PATCH] v4l: fix regression modprobe bttv freezes the computer

[Michael Krufky]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

Johannes Stezenbach wrote:

>>Graeme Christie wrote:
>>
>>>It seems to me as if this bug has resurfaced again.
>>>
>It probably got lost because it was
>applied to the kernel which v4l was maintainer- and CVS-less.
>http://groups-beta.google.com/group/linux.kernel/msg/6a27dd3dc46a5b5b?dmode=source&hl=en
>
>It would be cool if you could apply this patch to v4l CVS and
>send it to akpm for inclusion into 2.6.13 (hopefully), as
>the "hang at boot" issue is quite nasty.
>
Fix Bug 4395: modprobe bttv freezes the computer

http://bugme.osdl.org/show_bug.cgi?id=4395. (link is dead now)
Date: Wed, 13 Apr 2005 03:20:08
Patch by Manu Abraham and Gerd Knorr:


[-- Attachment #2: fix-regression-modprobe-bttv-freezes-the-computer.patch --]
[-- Type: text/plain, Size: 1076 bytes --]

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: Michael Krufky <mkrufky@m1k.net>

 linux/drivers/media/video/bttv-cards.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

diff -u linux-2.6.13-rc3-git3/drivers/media/video/bttv-cards.c linux/drivers/media/video/bttv-cards.c
--- linux-2.6.13-rc3-git3/drivers/media/video/bttv-cards.c	2005-07-16 15:25:34.000000000 +0000
+++ linux/drivers/media/video/bttv-cards.c	2005-07-20 22:00:26.000000000 +0000
@@ -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
 
@@ -2772,8 +2772,6 @@
         }
 	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)