Merge branch 'topic/misc' into for-linus

[linux-drm-fsl-dcu.git] / sound / usb / mixer.c

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index c8c28cd755348c63746e54ee654639299fc45dc2..eab06edcc9b73f8a56f0ec2bac616f3a8d535073 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1184,7 +1184,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
 /*
  * parse a feature unit
  *
- * most of controlls are defined here.
+ * most of controls are defined here.
  */
 static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void *_ftr)
 {