r2347 - in trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian: . patches patches/series

[Joshua Kwan]

Author: joshk
Date: 2005-01-21 11:16:31 +0100 (Fri, 21 Jan 2005)
New Revision: 2347

Added:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/au88x0-use-short-name.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6
Log:
add patch that fixes subtle au88*0 <-> libasound2 interaction

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2005-01-21 10:09:32 UTC (rev 2346)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2005-01-21 10:16:31 UTC (rev 2347)
@@ -1,4 +1,4 @@
-kernel-source-2.6.9 (2.6.9-5) UNRELEASED; urgency=low
+kernel-source-2.6.9 (2.6.9-6) UNRELEASED; urgency=low
 
   * [SECURITY] 033-rlimit_memlock_check.dpatch
     RLIMIT_MEMLOCK isn't checked properly, allowing for a DoS attack.
@@ -15,6 +15,10 @@
     Further do_brk fixes; just to be safe, lock everywhere do_brk
     is used (Andres Salomon).
 
+  * au88x0-use-short-name.dpatch: Use CARD_SHORT_NAME in au88x0.c to allow
+    card-specific driver names (CARD_SHORT_NAME is redefined by each driver.)
+    (Joshua Kwan)
+
   * Change $((exp) | exp) to $( (exp) | exp) in apply so things work 
     with dash (Simon Horman) (closes: #291107)
 

Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/au88x0-use-short-name.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/au88x0-use-short-name.dpatch	2005-01-21 10:09:32 UTC (rev 2346)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/au88x0-use-short-name.dpatch	2005-01-21 10:16:31 UTC (rev 2347)
@@ -0,0 +1,39 @@
+# origin: bk
+# cset: 1.1832.77.45 (linux-2.6)
+# inclusion: 2.6.10
+# description: allow unique driver name for au88x0 cards with CARD_SHORT_NAME
+# revision date: 2005-01-21
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/09/22 09:55:28+02:00 perex@suse.cz 
+#   [ALSA]  use card-specific driver name
+#   
+#   au88x0 driver
+#   use CARD_NAME_SHORT as driver name to allow different configuration file aliases in alsa-lib
+#   
+#   Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
+# 
+# sound/pci/au88x0/au88x0.c
+#   2004/09/22 02:11:15+02:00 perex@suse.cz +1 -1
+#   [ALSA]  use card-specific driver name
+#   
+#   D:2004/09/22 08:11:15
+#   C:au88x0 driver
+#   F:pci/au88x0/au88x0.c:1.12->1.13 
+#   L:use CARD_NAME_SHORT as driver name to allow different configuration file aliases in alsa-lib
+#   Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
+# 
+diff -Nru a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
+--- a/sound/pci/au88x0/au88x0.c	2005-01-21 02:12:49 -08:00
++++ b/sound/pci/au88x0/au88x0.c	2005-01-21 02:12:49 -08:00
+@@ -316,7 +316,7 @@
+ #endif
+ 
+ 	// (5)
+-	strcpy(card->driver, "Aureal Vortex");
++	strcpy(card->driver, CARD_NAME_SHORT);
+ 	strcpy(card->shortname, CARD_NAME_SHORT);
+ 	sprintf(card->longname, "%s at 0x%lx irq %i",
+ 		card->shortname, chip->io, chip->irq);

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6	2005-01-21 10:09:32 UTC (rev 2346)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6	2005-01-21 10:16:31 UTC (rev 2347)
@@ -1,3 +1,4 @@
 + 033-rlimit_memlock_check.dpatch
 + 034-stack_resize_exploit.dpatch
 + 035-do_brk_security_fixes-2.dpatch
++ au88x0-use-short-name.dpatch