]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
.32 patches
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 13 Feb 2010 00:19:17 +0000 (16:19 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 13 Feb 2010 00:19:17 +0000 (16:19 -0800)
queue-2.6.32/alsa-usb-audio-avoid-oops-after-disconnect.patch [new file with mode: 0644]
queue-2.6.32/series

diff --git a/queue-2.6.32/alsa-usb-audio-avoid-oops-after-disconnect.patch b/queue-2.6.32/alsa-usb-audio-avoid-oops-after-disconnect.patch
new file mode 100644 (file)
index 0000000..9527412
--- /dev/null
@@ -0,0 +1,34 @@
+From 78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 28 Dec 2009 12:24:22 +0100
+Subject: ALSA: usb-audio - Avoid Oops after disconnect
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d upstream.
+
+As the release of substreams may be done asynchronously from the
+disconnection, close callback needs to check the shutdown flag before
+actually accessing the usb interface.
+
+Reference: Novell bnc#505027
+       http://bugzilla.novell.com/show_bug.cgi?id=565027
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/usb/usbaudio.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/usb/usbaudio.c
++++ b/sound/usb/usbaudio.c
+@@ -1936,7 +1936,7 @@ static int snd_usb_pcm_close(struct snd_
+       struct snd_usb_stream *as = snd_pcm_substream_chip(substream);
+       struct snd_usb_substream *subs = &as->substream[direction];
+-      if (subs->interface >= 0) {
++      if (!as->chip->shutdown && subs->interface >= 0) {
+               usb_set_interface(subs->dev, subs->interface, 0);
+               subs->interface = -1;
+       }
index be26f0d334f50c1ce32898a22bd722f645a27472..a2a4e996a4a3ebe07e367577bbfeee1f65e98c36 100644 (file)
@@ -74,3 +74,4 @@ x86-amd-iommu-fix-deassignment-of-a-device-from-the-pt_domain.patch
 x86-re-get-cfg_new-in-case-reuse-move-irq_desc.patch
 tg3-fix-5906-transmit-hangs.patch
 staging-fix-rtl8187se-compilation-errors-with-mac80211.patch
+alsa-usb-audio-avoid-oops-after-disconnect.patch