diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:51 +0100 |
| commit | 9d0af44c2ed036c663832f3b764ffd1109c8b79e (patch) | |
| tree | 629864b4ce2743873f672d2ca03c0e295fb98525 /sound/usb | |
| parent | ALSA: hda/realtek - Add Headset Mic supported for HP cPC (diff) | |
| parent | ALSA: hda: Apply aligned MMIO access only conditionally (diff) | |
| download | linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.tar.xz linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.zip | |
Merge branch 'for-linus' into for-next
Resolved the merge conflict in HD-audio Tegra driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 5844a0c9d0db..bd258f1ec2dd 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -387,7 +387,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, add_sync_ep_from_ifnum: iface = usb_ifnum_to_if(dev, ifnum); - if (!iface || iface->num_altsetting == 0) + if (!iface || iface->num_altsetting < 2) return -EINVAL; alts = &iface->altsetting[1]; |