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/pcm.c | |
| parent | 5fab5829674c279839a7408ab30c71c6dfe726b9 (diff) | |
| parent | 51d4efab7865e6ea6a4ebcd25b3f03c019515c4c (diff) | |
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/pcm.c')
| -rw-r--r-- | sound/usb/pcm.c | 4 |
1 files changed, 2 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; |