diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 12:13:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 12:13:53 -0700 |
| commit | 87cf815b9e78af20bf139aa7536b42be2ce405c5 (patch) | |
| tree | ee389057e3e5aa8dc5eb3a5dfced48237ab1cdaa /sound/usb | |
| parent | b4af7f773ef79c479cc25ee26063821220150a8a (diff) | |
| parent | c64c1437afb14ebc900e40910f31ffb20bf652ad (diff) | |
| download | linux-0-day-87cf815b9e78af20bf139aa7536b42be2ce405c5.tar.gz linux-0-day-87cf815b9e78af20bf139aa7536b42be2ce405c5.tar.xz | |
Merge tag 'sound-fix-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"The previous pull request introduced a few WARN_ON() for Intel
HD-audio HDMI. Indeed it caught bugs, and now users get annoyed. So
this request came up: a collection of small fixes to paper over the
inconsistencies on (mostly) old Intel chipsets.
In addition, a trivial USB-audio quirk is included, too"
* tag 'sound-fix-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix missing ELD update at unplugging
ALSA: usb-audio: add Microsoft HD-5001 to quirks
ALSA: hda - Workaround for unbalanced i915 power refcount by concurrent probe
ALSA: hda - Fix spurious kernel WARNING on Baytrail HDMI
ALSA: hda - Fix forgotten HDMI monitor_present update
ALSA: hda - Really restrict i915 notifier to HSW+
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index a889d433cbdff..fb62bce2435c0 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1126,6 +1126,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) switch (chip->usb_id) { case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema */ case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */ + case USB_ID(0x045E, 0x076E): /* MS Lifecam HD-5001 */ case USB_ID(0x045E, 0x076F): /* MS Lifecam HD-6000 */ case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */ case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */ |