diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-01-05 09:19:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-05 09:19:34 +0100 |
| commit | 5d8398aa595dc3055dde003b6464963b71e4d8e2 (patch) | |
| tree | 2b756dcea50d3ca0e5d2ac18f07384014f78ca5c /sound/usb | |
| parent | ALSA: hda/realtek - Apply mic mute LED quirk for Dell E7xx laptops, too (diff) | |
| parent | ALSA: usb-audio: Apply the sample rate quirk for Bose Companion 5 (diff) | |
| download | wireguard-linux-5d8398aa595dc3055dde003b6464963b71e4d8e2.tar.xz wireguard-linux-5d8398aa595dc3055dde003b6464963b71e4d8e2.zip | |
Merge branch 'for-linus' into for-next
Merge 5.5-rc devel branch back for applying the conflicting USB-audio
fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/pcm.c | 4 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 0372f6212313..2f6a80ca36fc 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -519,9 +519,9 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) if (WARN_ON(!iface)) return -EINVAL; alts = usb_altnum_to_altsetting(iface, fmt->altsetting); - altsd = get_iface_desc(alts); - if (WARN_ON(altsd->bAlternateSetting != fmt->altsetting)) + if (WARN_ON(!alts)) return -EINVAL; + altsd = get_iface_desc(alts); if (fmt == subs->cur_audiofmt && !subs->need_setup_fmt) return 0; diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index a81c2066499f..82184036437b 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1397,6 +1397,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */ case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */ + case USB_ID(0x05a7, 0x1020): /* Bose Companion 5 */ case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ case USB_ID(0x1395, 0x740a): /* Sennheiser DECT */ case USB_ID(0x1901, 0x0191): /* GE B850V3 CP2114 audio interface */ |