[kernel] r5322 - in people/waldi/linux-2.6: . debian debian/bin debian/patches debian/patches/series

[Bastian Blank]

Author: waldi
Date: Fri Jan  6 21:01:11 2006
New Revision: 5322

Added:
   people/waldi/linux-2.6/debian/patches/alsa-opl3-oops.patch
   people/waldi/linux-2.6/debian/patches/series/2
Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/bin/apply.py
   people/waldi/linux-2.6/debian/changelog
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/bin/apply.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/apply.py	(original)
+++ people/waldi/linux-2.6/debian/bin/apply.py	Fri Jan  6 21:01:11 2006
@@ -75,7 +75,7 @@
                 elif operation == '+':
                     self.patch_apply(patch, patchinfo)
                 elif operation == '-':
-                    self.patch_deapply(patch, patchinf)
+                    self.patch_deapply(patch, patchinfo)
                 elif operation == 'X':
                     os.rename(patchinfo[0], patchinfo[1])
                     print """\

Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog	(original)
+++ people/waldi/linux-2.6/debian/changelog	Fri Jan  6 21:01:11 2006
@@ -3,6 +3,8 @@
   [ maximilian attems ]
   * Default to initramfs-tools as initramfs generator.
     (Closes: #346141, #343147, #341524)
+  * Backport alsa patch for opl3 - Fix the unreleased resources.
+    (Closes: #346273)
 
   [ dann frazier ]
   * [ia64] Update config for 2.6.15.
@@ -14,7 +16,7 @@
   [ Sven Luther ]
   * Removed spurious file from powerpc-apus patch. (Closes: #346159)
 
- -- Sven Luther <luther at debian.org>  Fri,  6 Jan 2006 07:56:52 +0000
+ -- maximilian attems <maks at sternwelten.at>  Fri,  6 Jan 2006 21:06:39 +0100
 
 linux-2.6 (2.6.15-1) unstable; urgency=low
 

Added: people/waldi/linux-2.6/debian/patches/alsa-opl3-oops.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/alsa-opl3-oops.patch	Fri Jan  6 21:01:11 2006
@@ -0,0 +1,50 @@
+tree 353750772b10adbfa8eed9a09fea94b72f8f55ad
+parent 3e23c658833f135508127c955d40d7c9387f71dd
+author Takashi Iwai <tiwai at suse.de> Tue, 03 Jan 2006 19:56:55 +0100
+committer Jaroslav Kysela <perex at suse.cz> Wed, 04 Jan 2006 10:13:52 +0100
+
+[ALSA] opl3 - Fix the unreleased resources
+
+Modules: OPL3
+
+Fix the unreleased resources in the error path of snd_opl3_create().
+
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+
+ sound/drivers/opl3/opl3_lib.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
+index 650f3b8..1e0c76b 100644
+--- a/sound/drivers/opl3/opl3_lib.c
++++ b/sound/drivers/opl3/opl3_lib.c
+@@ -407,13 +407,13 @@ int snd_opl3_create(struct snd_card *car
+ 	if (! integrated) {
+ 		if ((opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)")) == NULL) {
+ 			snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);
+-			snd_opl3_free(opl3);
++			snd_device_free(card, opl3);
+ 			return -EBUSY;
+ 		}
+ 		if (r_port != 0 &&
+ 		    (opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)")) == NULL) {
+ 			snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
+-			snd_opl3_free(opl3);
++			snd_device_free(card, opl3);
+ 			return -EBUSY;
+ 		}
+ 	}
+@@ -432,7 +432,7 @@ int snd_opl3_create(struct snd_card *car
+ 		if ((err = snd_opl3_detect(opl3)) < 0) {
+ 			snd_printd("OPL2/3 chip not detected at 0x%lx/0x%lx\n",
+ 				   opl3->l_port, opl3->r_port);
+-			snd_opl3_free(opl3);
++			snd_device_free(card, opl3);
+ 			return err;
+ 		}
+ 		/* detect routine returns correct hardware type */
+-
+To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+

Added: people/waldi/linux-2.6/debian/patches/series/2
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/series/2	Fri Jan  6 21:01:11 2006
@@ -0,0 +1,3 @@
+- powerpc-arch-default-powerpc.patch
++ alsa-opl3-oops.patch
+