diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-09-06 11:04:03 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-09-06 11:04:15 +0200 |
| commit | 16c5cde20e304cd900371b140cd53ecafe8d3de5 (patch) | |
| tree | e1ece341f2ef3ac98069c3fcb350e16f0a8645bb /sound/usb | |
| parent | 32eeeed963ad4f41b422b3e314d96ded7283b201 (diff) | |
| parent | 37137ec26c2c03039d8064c00f6eae176841ee0d (diff) | |
Merge branch 'for-linus' into for-next
Once again back-merge the 6.0-rc devel branch for further USB-audio
and HD-audio developments.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 224d39638820..f75601ca2d52 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -1106,7 +1106,7 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip, * Dallas DS4201 workaround: It presents 5 altsettings, but the last * one misses syncpipe, and does not produce any sound. */ - if (chip->usb_id == USB_ID(0x04fa, 0x4201)) + if (chip->usb_id == USB_ID(0x04fa, 0x4201) && num >= 4) num = 4; for (i = 0; i < num; i++) { |