[PATCH] snd-usb-audio with multiple audio functions

[Rolf Meeser <rolfm_9dq@yahoo.de>]

[-- Attachment #1: Type: text/plain, Size: 1974 bytes --]

Hello,

This patch fixes the currently broken support for multiple audio 
functions (AF) in snd-usb-audio.
The patch is against the stable 2.6.39.1 kernel.

It addresses three issues:
1. Controls of the second and any further AF are currently not 
accessibly (controls of the first AF are duplicated!)
2. Multiple AF's are currently incorrectly combined into one sound card 
index.
3. Module usage count of snd-usb-audio does not drop to zero after 
disconnecting a multiple AF device.

All three issues are fixed by assigning a new card index for each AF in 
a USB device.


Rationale:

- A USB audio function (AF) consists of a control interface and zero or 
more streaming interfaces. USB devices can have multiple AF, where the 
individual AF are completely independent of each other. In particular, 
it cannot be assumed that the controls of one AF can be manipulated 
through the control interface of another (the first) AF.

- Older kernels (up to 2.6.32? at least before the major rewrite of USB 
audio code) supported multiple AF's. However, they combined the streams 
into one sound card: For instance hw:1,0 for the stream interface of the 
first AF, and hw:1,1 for the stream interface of the second AF.
I believe this is incorrect, as different AF's must be treated as an 
independent entity. Each AF must get its own card index, for the example 
this would be hw:1,0 and hw:2,0. This is also the way THE OTHER OS 
implements it.

- Newer kernels have broken multiple AF support. In a dual AF setup 
these kernels detect the second AF, but they duplicate the controls of 
the first AF, and ignore the controls of the second one!

- The patch also fixes a problem with module usage: When you unplug a 
multiple AF device, the snd-usb-audio module usage count currently stays 
at 1, while you could expect it to go to zero.

This is the first time I'm sending a patch to this list. Please be 
patient with me if I did something in a wrong way :-)

Regards,
Rolf


[-- Attachment #2: patch-multiple-aic --]
[-- Type: text/plain, Size: 683 bytes --]

diff -ur linux-2.6.39.1.orig/sound/usb/card.c linux-2.6.39.1/sound/usb/card.c
--- linux-2.6.39.1.orig/sound/usb/card.c	2011-06-06 06:37:26.000000000 +0200
+++ linux-2.6.39.1/sound/usb/card.c	2011-06-06 07:06:06.000000000 +0200
@@ -461,7 +461,10 @@
 	chip = NULL;
 	mutex_lock(&register_mutex);
 	for (i = 0; i < SNDRV_CARDS; i++) {
-		if (usb_chip[i] && usb_chip[i]->dev == dev) {
+		if (usb_chip[i] &&
+			(usb_chip[i]->dev == dev) &&
+			(usb_chip[i]->ctrl_intf) &&
+			(usb_chip[i]->ctrl_intf->desc.bInterfaceNumber == ifnum)) {
 			if (usb_chip[i]->shutdown) {
 				snd_printk(KERN_ERR "USB device is in the shutdown state, cannot create a card instance\n");
 				goto __error;


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]