sound fixes
Subsystems (3)
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
In addition to previous pull request, a few more fixes came in. Slightly large chunks are found in HD-audio codec drivers, but they are either the addition of errata verbs or the quirk for one laptop model, so pretty safe. Others are mostly small fixes.
Thanks!
Takashi
===
Brian Austin (1):
ALSA: hda - Add errata initverb sequence for CS42xx codecs
Clemens Ladisch (3):
ALSA: usb-audio: fix detection of vendor-specific device protocol settings
ALSA: virtuoso: work around missing reset in the Xonar DS Windows driver
ALSA: virtuoso: fix setting of Xonar DS line-in/mic-in controls
Dan Carpenter (1):
ALSA: rawmidi: fix the get next midi device ioctl
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
Takashi Iwai (6):
ALSA: hda - Add quirk for Lenovo T400s
ALSA: usb - Release capture substream URBs properly
ALSA: hda - Enable PC-beep for EeePC with ALC269 codec
ALSA: msnd-classic: Fix invalid cfg parameter
ALSA: seq/oss - Fix double-free at error path of snd_seq_oss_open()
ALSA: hda - Fix wrong HP pin detection in snd_hda_parse_pin_def_config()
--- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + sound/core/rawmidi.c | 2 + sound/core/seq/oss/seq_oss_init.c | 9 ++-- sound/isa/msnd/msnd_pinnacle.c | 8 +++- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/patch_cirrus.c | 50 ++++++++++++++++++++++ sound/pci/hda/patch_conexant.c | 58 ++++++++++++++++++++++++++ sound/pci/hda/patch_realtek.c | 1 + sound/pci/oxygen/oxygen.h | 1 + sound/pci/oxygen/oxygen_lib.c | 21 ++++++++- sound/pci/oxygen/virtuoso.c | 1 + sound/pci/oxygen/xonar_wm87x6.c | 22 +++++++++- sound/usb/card.c | 19 ++++++--- 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 +- 18 files changed, 204 insertions(+), 40 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/core/rawmidi.c +2 -0
@@ -829,6 +829,8 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card,if (get_user (device, (int __user *)argp))return -EFAULT ; +if (device >=SNDRV_RAWMIDI_DEVICES )/* next device is -1 */ + device =SNDRV_RAWMIDI_DEVICES -1 ;mutex_lock (®ister_mutex); device = device <0 ?0 : device +1 ;while (device <SNDRV_RAWMIDI_DEVICES ) {
sound/core/seq/oss/seq_oss_init.c +4 -5
@@ -281,13 +281,10 @@ snd_seq_oss_open(struct file *file, int level)return 0 ; _error: -snd_seq_oss_writeq_delete (dp->writeq); -snd_seq_oss_readq_delete (dp->readq);snd_seq_oss_synth_cleanup (dp);snd_seq_oss_midi_cleanup (dp); -delete_port (dp);delete_seq_queue (dp->queue); -kfree (dp); +delete_port (dp);return rc; }
@@ -350,8 +347,10 @@ create_port(struct seq_oss_devinfo *dp)static int delete_port (struct seq_oss_devinfo *dp) { -if (dp->port <0 ) +if (dp->port <0 ) { +kfree (dp);return 0 ; + }debug_printk (("delete_port %i\n" , dp->port));return snd_seq_event_port_detach (dp->cseq, dp->port);
sound/isa/msnd/msnd_pinnacle.c +6 -2
@@ -764,9 +764,9 @@ static long io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;static int irq[SNDRV_CARDS ] =SNDRV_DEFAULT_IRQ ;static long mem[SNDRV_CARDS ] =SNDRV_DEFAULT_PORT ; +#ifndef MSND_CLASSIC static long cfg[SNDRV_CARDS ] =SNDRV_DEFAULT_PORT ; -#ifndef MSND_CLASSIC /* Extra Peripheral Configuration (Default: Disable) */ static long ide_io0[SNDRV_CARDS ] =SNDRV_DEFAULT_PORT ;static long ide_io1[SNDRV_CARDS ] =SNDRV_DEFAULT_PORT ;
@@ -894,7 +894,11 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)struct snd_card *card;struct snd_msnd *chip; -if (has_isapnp (idx) || cfg[idx] ==SNDRV_AUTO_PORT ) { +if (has_isapnp (idx) +#ifndef MSND_CLASSIC + || cfg[idx] ==SNDRV_AUTO_PORT +#endif + ) { printk(KERN_INFO LOGNAME ": Assuming PnP mode\n");return -ENODEV ; }
sound/pci/hda/hda_codec.c +1 -1
@@ -4536,7 +4536,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, cfg->hp_outs--;memmove (cfg->hp_pins + i, cfg->hp_pins + i +1 ,sizeof (cfg->hp_pins[0 ]) * (cfg->hp_outs - i)); -memmove (sequences_hp + i -1 , sequences_hp + i, +memmove (sequences_hp + i, sequences_hp + i +1 ,sizeof (sequences_hp[0 ]) * (cfg->hp_outs - i)); } }
sound/pci/hda/patch_cirrus.c +50 -0
62 lines not on this page · raw message
sound/pci/hda/patch_conexant.c +58 -0
114 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +1 -0
@@ -5334,6 +5334,7 @@ static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids,static struct snd_pci_quirk beep_white_list[] = {SND_PCI_QUIRK (0x1043 ,0x829f ,"ASUS" ,1 ), +SND_PCI_QUIRK (0x1043 ,0x83ce ,"EeePC" ,1 ),SND_PCI_QUIRK (0x8086 ,0xd613 ,"Intel" ,1 ), {} };
sound/pci/oxygen/oxygen.h +1 -0
@@ -155,6 +155,7 @@ void oxygen_pci_remove(struct pci_dev *pci);int oxygen_pci_suspend (struct pci_dev *pci,pm_message_t state);int oxygen_pci_resume (struct pci_dev *pci);#endif +void oxygen_pci_shutdown (struct pci_dev *pci);/* oxygen_mixer.c */
sound/pci/oxygen/oxygen_lib.c +18 -3
@@ -519,16 +519,21 @@ static void oxygen_init(struct oxygen *chip) } } -static void oxygen_card_free (struct snd_card *card) +static void oxygen_shutdown (struct oxygen *chip) { -struct oxygen *chip = card->private_data; -spin_lock_irq (&chip->reg_lock); chip->interrupt_mask =0 ; chip->pcm_running =0 ;oxygen_write16 (chip,OXYGEN_DMA_STATUS ,0 );oxygen_write16 (chip,OXYGEN_INTERRUPT_MASK ,0 );spin_unlock_irq (&chip->reg_lock); +} + +static void oxygen_card_free (struct snd_card *card) +{ +struct oxygen *chip = card->private_data; + +oxygen_shutdown (chip);if (chip->irq >=0 )free_irq (chip->irq, chip);flush_scheduled_work ();
@@ -778,3 +783,13 @@ int oxygen_pci_resume(struct pci_dev *pci) }EXPORT_SYMBOL (oxygen_pci_resume);#endif /* CONFIG_PM */ + +void oxygen_pci_shutdown (struct pci_dev *pci) +{ +struct snd_card *card =pci_get_drvdata (pci); +struct oxygen *chip = card->private_data; + +oxygen_shutdown (chip); + chip->model.cleanup (chip); +} +EXPORT_SYMBOL (oxygen_pci_shutdown);
sound/pci/oxygen/virtuoso.c +1 -0
@@ -95,6 +95,7 @@ static struct pci_driver xonar_driver = { .suspend = oxygen_pci_suspend, .resume = oxygen_pci_resume, #endif + .shutdown = oxygen_pci_shutdown, };static int __init alsa_card_xonar_init (void )
sound/pci/oxygen/xonar_wm87x6.c +21 -1
@@ -53,6 +53,8 @@ struct xonar_wm87x6 {struct xonar_generic generic;u16 wm8776_regs[0x17 ];u16 wm8766_regs[0x10 ]; +struct snd_kcontrol *line_adcmux_control; +struct snd_kcontrol *mic_adcmux_control;struct snd_kcontrol *lc_controls[13 ]; };
@@ -193,6 +195,7 @@ static void xonar_ds_init(struct oxygen *chip)static void xonar_ds_cleanup (struct oxygen *chip) {xonar_disable_output (chip); +wm8776_write (chip,WM8776_RESET ,0 ); }static void xonar_ds_suspend (struct oxygen *chip)
@@ -603,6 +606,7 @@ static int wm8776_input_mux_put(struct snd_kcontrol *ctl, {struct oxygen *chip = ctl->private_data;struct xonar_wm87x6 *data = chip->model_data; +struct snd_kcontrol *other_ctl;unsigned int mux_bit = ctl->private_value;u16 reg;int changed;
@@ -610,8 +614,18 @@ static int wm8776_input_mux_put(struct snd_kcontrol *ctl,mutex_lock (&chip->mutex); reg = data->wm8776_regs[WM8776_ADCMUX ];if (value->value.integer.value[0 ]) { - reg &= ~0x003 ; reg |= mux_bit; +/* line-in and mic-in are exclusive */ + mux_bit ^=3 ; +if (reg & mux_bit) { + reg &= ~mux_bit; +if (mux_bit ==1 ) + other_ctl = data->line_adcmux_control; +else + other_ctl = data->mic_adcmux_control; +snd_ctl_notify (chip->card,SNDRV_CTL_EVENT_MASK_VALUE , + &other_ctl->id); + } }else reg &= ~mux_bit; changed = reg != data->wm8776_regs[WM8776_ADCMUX ];
@@ -963,7 +977,13 @@ static int xonar_ds_mixer_init(struct oxygen *chip) err =snd_ctl_add (chip->card, ctl);if (err <0 )return err; +if (!strcmp (ctl->id.name,"Line Capture Switch" )) + data->line_adcmux_control = ctl; +else if (!strcmp (ctl->id.name,"Mic Capture Switch" )) + data->mic_adcmux_control = ctl; } +if (!data->line_adcmux_control || !data->mic_adcmux_control) +return -ENXIO ;BUILD_BUG_ON (ARRAY_SIZE (lc_controls) !=ARRAY_SIZE (data->lc_controls));for (i =0 ; i <ARRAY_SIZE (lc_controls); ++i) { ctl =snd_ctl_new1 (&lc_controls[i], chip);
sound/usb/card.c +13 -6
@@ -126,7 +126,7 @@ static void snd_usb_stream_disconnect(struct list_head *head)for (idx =0 ; idx <2 ; idx++) { subs = &as->substream[idx];if (!subs->num_formats) -return ; +continue ;snd_usb_release_substream_urbs (subs,1 ); subs->interface =-1 ; }
@@ -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 ; }/*