aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/usb/mixer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 45cc0aff9c3e..ca4739c3f650 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2123,7 +2123,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
2123 state.oterm.type = le16_to_cpu(desc->wTerminalType); 2123 state.oterm.type = le16_to_cpu(desc->wTerminalType);
2124 state.oterm.name = desc->iTerminal; 2124 state.oterm.name = desc->iTerminal;
2125 err = parse_audio_unit(&state, desc->bSourceID); 2125 err = parse_audio_unit(&state, desc->bSourceID);
2126 if (err < 0) 2126 if (err < 0 && err != -EINVAL)
2127 return err; 2127 return err;
2128 } else { /* UAC_VERSION_2 */ 2128 } else { /* UAC_VERSION_2 */
2129 struct uac2_output_terminal_descriptor *desc = p; 2129 struct uac2_output_terminal_descriptor *desc = p;
@@ -2135,12 +2135,12 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
2135 state.oterm.type = le16_to_cpu(desc->wTerminalType); 2135 state.oterm.type = le16_to_cpu(desc->wTerminalType);
2136 state.oterm.name = desc->iTerminal; 2136 state.oterm.name = desc->iTerminal;
2137 err = parse_audio_unit(&state, desc->bSourceID); 2137 err = parse_audio_unit(&state, desc->bSourceID);
2138 if (err < 0) 2138 if (err < 0 && err != -EINVAL)
2139 return err; 2139 return err;
2140 2140
2141 /* for UAC2, use the same approach to also add the clock selectors */ 2141 /* for UAC2, use the same approach to also add the clock selectors */
2142 err = parse_audio_unit(&state, desc->bCSourceID); 2142 err = parse_audio_unit(&state, desc->bCSourceID);
2143 if (err < 0) 2143 if (err < 0 && err != -EINVAL)
2144 return err; 2144 return err;
2145 } 2145 }
2146 } 2146 }