[parisc-linux-cvs] linux deller

[Helge Deller]

--------------Boundary-00=_51FJE725JICWOU55BBRU
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit

On Thursday 14 February 2002 20:02, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/02/14 12:02:22
>
> Modified files:
> 	drivers/sound  : harmony.c
>
> Log message:
> update todo-list, small error-handling cleanup, no functional changes



--------------Boundary-00=_51FJE725JICWOU55BBRU
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline; filename="diff"

? harmony.c.hel
? harmony.c.hel2
Index: harmony.c
===================================================================
RCS file: /var/cvs/linux/drivers/sound/harmony.c,v
retrieving revision 1.24
diff -u -p -r1.24 harmony.c
--- harmony.c	2002/02/10 03:09:04	1.24
+++ harmony.c	2002/02/14 19:01:27
@@ -9,9 +9,9 @@
 	called 'Vivace'. Both Harmony and Vicace are supported by this driver.
 
 	Copyright 2000 (c) Linuxcare Canada, Alex deVries <alex@linuxcare.com>
-	Copyright 2001 (c) Jean-Christophe Vaugeois <vaugeoij@esiee.fr>
-	Copyright 2001 (c) Matthieu Delahaye <delahaym@esiee.fr>
 	Copyright 2000-2002 (c) Helge Deller <deller@gmx.de>
+	Copyright 2001 (c) Matthieu Delahaye <delahaym@esiee.fr>
+	Copyright 2001 (c) Jean-Christophe Vaugeois <vaugeoij@esiee.fr>
 
 				
 TODO:
@@ -19,8 +19,9 @@ TODO:
 		return the real values
 	- add private ioctl for selecting line- or microphone input
 		(only one of them is available at the same time)
-	- implement gain meter ?
 	- add module parameters
+	- implement mmap functionality
+	- implement gain meter ?
 	- ...
 */
 
@@ -1208,6 +1209,7 @@ harmony_driver_callback(struct parisc_de
 	   ever is. */
 	if (cntl & CNTL_C) {
 		printk(KERN_WARNING PFX "CNTL busy\n");
+		harmony.hpa = 0;
 		return -EBUSY;
 	}
 
@@ -1232,6 +1234,7 @@ harmony_driver_callback(struct parisc_de
 	return 0;
 
 out_err:
+	harmony.hpa = 0;
 	harmony_free_buffer(&played_buf);
 	harmony_free_buffer(&recorded_buf);
 	harmony_free_buffer(&graveyard);

--------------Boundary-00=_51FJE725JICWOU55BBRU--