Merge branch 'for-linus' into for-next

Browse source

Merge back for-linus branch for the badness table adjustment for VIA codecs

* for-linus:
  ALSA: hda - Fix DAC assignment for independent HP
  ALSA: hda - Fix abuse of snd_hda_lock_devices() for DSP loader
  ALSA: hda - Fix typo in checking IEC958 emphasis bit
  ALSA: snd-usb: mixer: ignore -EINVAL in snd_usb_mixer_controls()
  ALSA: snd-usb: mixer: propagate errors up the call chain
  ALSA: usb: Parse UAC2 extension unit like for UAC1
  ALSA: hda - Fix yet missing GPIO/EAPD setup in cirrus driver

...

This commit is contained in:

Takashi Iwai 2013-03-22 14:53:25 +01:00

parent f390dad4d8 55a63d4da3

commit 10d7410790

5 changed files with 171 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/pci/hda/hda_codec.c

View file

46

sound/pci/hda/hda_generic.c

View file

132

sound/pci/hda/hda_intel.c

View file

4

sound/pci/hda/patch_cirrus.c

View file

21

sound/usb/mixer.c

View file