sound fixes
Subsystems (2)
Linus,
please pull sound fixes for v2.6.36-rc4 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
Two USB-audio fixes and one HD-audio quirk. A bit longer patches than usual at this time, but they look sane enough.
thanks,
Takashi
===
Clemens Ladisch (1):
ALSA: usb-audio: fix detection of vendor-specific device protocol settings
Daniel Mack (1):
ALSA: usb-audio: Assume first control interface is for audio
David Henningsson (1):
ALSA: hda - Add a new hp-laptop model for Conexant 5066, tested on HP G60
--- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + sound/pci/hda/patch_conexant.c | 57 ++++++++++++++++++++++++++ sound/usb/card.c | 17 +++++-- sound/usb/clock.c | 3 +- sound/usb/endpoint.c | 11 +++-- sound/usb/format.c | 22 +++++----- sound/usb/mixer.c | 10 ++++- sound/usb/pcm.c | 3 +- 8 files changed, 97 insertions(+), 27 deletions(-)
Documentation/sound/alsa/HD-Audio-Models.txt +1 -0
@@ -296,6 +296,7 @@ Conexant 5051 Conexant 5066 ============= laptop Basic Laptop config (default) + hp-laptop HP laptops, e g G60 dell-laptop Dell laptops dell-vostro Dell Vostro olpc-xo-1_5 OLPC XO 1.5
sound/pci/hda/patch_conexant.c +57 -0
111 lines not on this page · raw message
sound/usb/card.c +12 -5
@@ -216,6 +216,11 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) }switch (protocol) { +default : +snd_printdd (KERN_WARNING "unknown interface protocol %#02x, assuming v1\n" , + protocol); +/* fall through */ +case UAC_VERSION_1 : {struct uac1_ac_header_descriptor *h1 = control_header;
@@ -253,10 +258,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)break ; } - -default : -snd_printk (KERN_ERR "unknown protocol version 0x%02x\n" , protocol); -return -EINVAL ; }return 0 ;
@@ -465,7 +466,13 @@ static void *snd_usb_audio_probe(struct usb_device *dev, goto __error; } - chip->ctrl_intf = alts; +/* +* For devices with more than one control interface, we assume the +* first contains the audio controls. We might need a more specific +* check here in the future. +*/ +if (!chip->ctrl_intf) + chip->ctrl_intf = alts;if (err >0 ) {/* create normal USB audio interfaces */
sound/usb/clock.c +1 -2
@@ -295,12 +295,11 @@ int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,switch (altsd->bInterfaceProtocol) {case UAC_VERSION_1 : +default :return set_sample_rate_v1 (chip, iface, alts, fmt, rate);case UAC_VERSION_2 :return set_sample_rate_v2 (chip, iface, alts, fmt, rate); } - -return -EINVAL ; }
sound/usb/endpoint.c +6 -5
@@ -275,6 +275,12 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)/* get audio formats */ switch (protocol) { +default : +snd_printdd (KERN_WARNING "%d:%u:%d: unknown interface protocol %#02x, assuming v1\n" , + dev->devnum, iface_no, altno, protocol); + protocol =UAC_VERSION_1 ; +/* fall through */ +case UAC_VERSION_1 : {struct uac1_as_header_descriptor *as =snd_usb_find_csint_desc (alts->extra, alts->extralen,NULL ,UAC_AS_GENERAL );
@@ -336,11 +342,6 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) dev->devnum, iface_no, altno, as->bTerminalLink);continue ; } - -default : -snd_printk (KERN_ERR "%d:%u:%d : unknown interface protocol %04x\n" , - dev->devnum, iface_no, altno, protocol); -continue ; }/* get format type */
sound/usb/format.c +10 -12
@@ -49,7 +49,8 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,u64 pcm_formats;switch (protocol) { -case UAC_VERSION_1 : { +case UAC_VERSION_1 : +default : {struct uac_format_type_i_discrete_descriptor *fmt = _fmt; sample_width = fmt->bBitResolution; sample_bytes = fmt->bSubframeSize;
@@ -64,9 +65,6 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, format <<=1 ;break ; } - -default : -return -EINVAL ; } pcm_formats =0 ;
@@ -384,6 +382,10 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,* audio class v2 uses class specific EP0 range requests for that. */ switch (protocol) { +default : +snd_printdd (KERN_WARNING "%d:%u:%d : invalid protocol version %d, assuming v1\n" , + chip->dev->devnum, fp->iface, fp->altsetting, protocol); +/* fall through */ case UAC_VERSION_1 : fp->channels = fmt->bNrChannels; ret =parse_audio_format_rates_v1 (chip, fp, (unsigned char *) fmt,7 );
@@ -392,10 +394,6 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,/* fp->channels is already set in this case */ ret =parse_audio_format_rates_v2 (chip, fp);break ; -default : -snd_printk (KERN_ERR "%d:%u:%d : invalid protocol version %d\n" , - chip->dev->devnum, fp->iface, fp->altsetting, protocol); -return -EINVAL ; }if (fp->channels <1 ) {
@@ -438,6 +436,10 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, fp->channels =1 ;switch (protocol) { +default : +snd_printdd (KERN_WARNING "%d:%u:%d : invalid protocol version %d, assuming v1\n" , + chip->dev->devnum, fp->iface, fp->altsetting, protocol); +/* fall through */ case UAC_VERSION_1 : {struct uac_format_type_ii_discrete_descriptor *fmt = _fmt; brate =le16_to_cpu (fmt->wMaxBitRate);
@@ -456,10 +458,6 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, ret =parse_audio_format_rates_v2 (chip, fp);break ; } -default : -snd_printk (KERN_ERR "%d:%u:%d : invalid protocol version %d\n" , - chip->dev->devnum, fp->iface, fp->altsetting, protocol); -return -EINVAL ; }return ret;
sound/usb/mixer.c +9 -1
@@ -2175,7 +2175,15 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, } host_iface = &usb_ifnum_to_if (chip->dev, ctrlif)->altsetting[0 ]; - mixer->protocol =get_iface_desc (host_iface)->bInterfaceProtocol; +switch (get_iface_desc (host_iface)->bInterfaceProtocol) { +case UAC_VERSION_1 : +default : + mixer->protocol =UAC_VERSION_1 ; +break ; +case UAC_VERSION_2 : + mixer->protocol =UAC_VERSION_2 ; +break ; + }if ((err =snd_usb_mixer_controls (mixer)) <0 || (err =snd_usb_mixer_status_create (mixer)) <0 )
sound/usb/pcm.c +1 -2
@@ -173,13 +173,12 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,switch (altsd->bInterfaceProtocol) {case UAC_VERSION_1 : +default :return init_pitch_v1 (chip, iface, alts, fmt);case UAC_VERSION_2 :return init_pitch_v2 (chip, iface, alts, fmt); } - -return -EINVAL ; }/*