patch-2.0.1 linux/drivers/sound/ics2101.c

• Lines: 76
• Date: Sun Jun 30 11:44:01 1996
• Orig file: v2.0.0/linux/drivers/sound/ics2101.c
• Orig date: Sun Mar 24 22:50:04 1996

diff -u --recursive --new-file v2.0.0/linux/drivers/sound/ics2101.c linux/drivers/sound/ics2101.c
@@ -4,27 +4,11 @@
  * Driver for the ICS2101 mixer of GUS v3.7.
  */
 /*
- * Copyright by Hannu Savolainen 1993-1996
+ * Copyright (C) by Hannu Savolainen 1993-1996
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * USS/Lite for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
+ * Version 2 (June 1991). See the "COPYING" file distributed with this software
+ * for more info.
  */
 #include <linux/config.h>
 
@@ -164,7 +148,7 @@
 	    break;
 
 	  default:
-	    return -EINVAL;
+	    return -(EINVAL);
 	  }
       else
 	switch (cmd & 0xff)	/*
@@ -213,21 +197,22 @@
 	    break;
 
 	  default:
-	    return -EINVAL;
+	    return -(EINVAL);
 	  }
     }
 
-  return -EINVAL;
+  return -(EINVAL);
 }
 
 static struct mixer_operations ics2101_mixer_operations =
 {
+  "ICS2101",
   "ICS2101 Multimedia Mixer",
   ics2101_mixer_ioctl
 };
 
-long
-ics2101_mixer_init (long mem_start)
+void
+ics2101_mixer_init (void)
 {
   int             i;
 
@@ -256,7 +241,6 @@
       set_volumes (DEV_UNUSED, 0x0000);
     }
 
-  return mem_start;
 }
 
 #endif