Add asla fix for extra snd_device_free call in opl3-oss, fwd from akpm

diff --git a/queue/alsa-fix-bogus-snd_device_free-in-opl3-oss.c.patch b/queue/alsa-fix-bogus-snd_device_free-in-opl3-oss.c.patch
new file mode 100644 (file)
index 0000000..d592163
--- /dev/null
+++ b/queue/alsa-fix-bogus-snd_device_free-in-opl3-oss.c.patch
@@ -0,0 +1,34 @@
+From stable-bounces@linux.kernel.org  Fri Feb 24 13:08:11 2006
+Date: Fri, 24 Feb 2006 13:03:52 -0800
+From: akpm@osdl.org
+To: torvalds@osdl.org
+Cc: tiwai@suse.de, stable@kernel.org, perex@suse.cz
+Subject: [PATCH] alsa: fix bogus snd_device_free() in opl3-oss.c
+
+
+From: Takashi Iwai <tiwai@suse.de>
+
+Remove snd_device_free() for an opl3-oss instance which should have been
+released.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Cc: Jaroslav Kysela <perex@suse.cz>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ sound/drivers/opl3/opl3_oss.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.15.4.orig/sound/drivers/opl3/opl3_oss.c
++++ linux-2.6.15.4/sound/drivers/opl3/opl3_oss.c
+@@ -146,7 +146,7 @@ void snd_opl3_init_seq_oss(opl3_t *opl3,
+ void snd_opl3_free_seq_oss(opl3_t *opl3)
+ {
+       if (opl3->oss_seq_dev) {
+-              snd_device_free(opl3->card, opl3->oss_seq_dev);
++              /* The instance should have been released in prior */
+               opl3->oss_seq_dev = NULL;
+       }
+ }

diff --git a/queue/series b/queue/series
index 0dcce1fad298d3b122170596766c07da77ee5f3e..e5e1ec78c622afc0b9e7651e63e56593ba87d81d 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -19,3 +19,4 @@ sys_mbind-sanity-checking.patch
 it87-fix-oops-on-removal.patch
 hwmon-it87-probe-i2c-0x2d-only.patch
 fix-snd-usb-audio-in-32-bit-compat-environment.patch
+alsa-fix-bogus-snd_device_free-in-opl3-oss.c.patch