[Gc-linux-cvs] linux/sound/ppc gcn-ai.c,1.6,1.7 gcn-mic.c,1.1,1.2

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22637/sound/ppc

Modified Files:
	gcn-ai.c gcn-mic.c 
Log Message:
Merged 2.6.19.


Index: gcn-mic.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-mic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcn-mic.c	17 May 2006 22:14:40 -0000	1.1
+++ gcn-mic.c	18 Feb 2007 22:56:04 -0000	1.2
@@ -649,7 +649,7 @@
 
 	if (dev->card) {
 		snd_card_disconnect(dev->card);
-		snd_card_free_in_thread(dev->card);
+		snd_card_free_when_closed(dev->card);
 
 		dev->card = NULL;
 		dev->pcm = NULL;

Index: gcn-ai.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gcn-ai.c	17 May 2006 22:14:40 -0000	1.6
+++ gcn-ai.c	18 Feb 2007 22:56:04 -0000	1.7
@@ -250,7 +250,7 @@
 	return bytes_to_frames(runtime, bytes - left);
 }
 
-static irqreturn_t snd_gcn_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t snd_gcn_interrupt(int irq, void *dev)
 {
 	snd_gcn_t *chip = (snd_gcn_t *) dev;
 	unsigned long flags;