This is a note to let you know that I've just added the patch titled
ALSA: snd-usb: fix cross-interface streaming devices
to the 3.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-snd-usb-fix-cross-interface-streaming-devices.patch
and it can be found in the queue-3.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 2e4a263ca80a203ac6109f5932722a716c265395 Mon Sep 17 00:00:00 2001
From: Daniel Mack <[email protected]>
Date: Thu, 30 Aug 2012 18:52:31 +0200
Subject: ALSA: snd-usb: fix cross-interface streaming devices
From: Daniel Mack <[email protected]>
commit 2e4a263ca80a203ac6109f5932722a716c265395 upstream.
Commit 68e67f40b ("ALSA: snd-usb: move calls to usb_set_interface")
saved us some unnecessary calls to snd_usb_set_interface() but ignored
the fact that there is at least one device out there which operates on
two endpoint in different interfaces simultaniously.
Take care for this by catching the case where data and sync endpoints
are located on different interfaces and calling snd_usb_set_interface()
between the start of the two endpoints.
Signed-off-by: Daniel Mack <[email protected]>
Reported-by: Robert M. Albrecht <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
sound/usb/pcm.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -236,6 +236,21 @@ static int start_endpoints(struct snd_us
!test_and_set_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags)) {
struct snd_usb_endpoint *ep = subs->sync_endpoint;
+ if (subs->data_endpoint->iface != subs->sync_endpoint->iface ||
+ subs->data_endpoint->alt_idx !=
subs->sync_endpoint->alt_idx) {
+ err = usb_set_interface(subs->dev,
+ subs->sync_endpoint->iface,
+ subs->sync_endpoint->alt_idx);
+ if (err < 0) {
+ snd_printk(KERN_ERR
+ "%d:%d:%d: cannot set interface
(%d)\n",
+ subs->dev->devnum,
+ subs->sync_endpoint->iface,
+ subs->sync_endpoint->alt_idx, err);
+ return -EIO;
+ }
+ }
+
snd_printdd(KERN_DEBUG "Starting sync EP @%p\n", ep);
ep->sync_slave = subs->data_endpoint;
Patches currently in stable-queue which might be from [email protected] are
queue-3.5/alsa-snd-usb-fix-urb-cancellation-at-stream-start.patch
queue-3.5/alsa-snd-usb-fix-calls-to-next_packet_size.patch
queue-3.5/alsa-snd-usb-fix-cross-interface-streaming-devices.patch
queue-3.5/alsa-snd-usb-restore-delay-information.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
