From f25e23a1824c1bd55a5b2766d5e3b79d05b987e4 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Thu, 27 May 2010 20:15:14 +0200
Subject: [PATCH] --- yaml --- r: 199300 b: refs/heads/master c:
 e8d0fee70b66694959eab10c41788b9279d73629 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/sound/usb/mixer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a31361463956..765b7c6b47b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee317fe9cf08d81501b142bf0054c25e3ed5e7d
+refs/heads/master: e8d0fee70b66694959eab10c41788b9279d73629
diff --git a/trunk/sound/usb/mixer.c b/trunk/sound/usb/mixer.c
index 97dd17655104..03ce971e0027 100644
--- a/trunk/sound/usb/mixer.c
+++ b/trunk/sound/usb/mixer.c
@@ -1126,7 +1126,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
 	} else {
 		struct uac2_feature_unit_descriptor *ftr = _ftr;
 		csize = 4;
-		channels = (hdr->bLength - 6) / 4;
+		channels = (hdr->bLength - 6) / 4 - 1;
 		bmaControls = ftr->bmaControls;
 	}