From 8818eaecc6c8b4cd47a21b9c7fa74c65c808ce6e Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Oct 2011 08:19:09 +0200
Subject: [PATCH] --- yaml --- r: 270447 b: refs/heads/master c:
 d09c06c6fc240261dde65198774b279d89c35459 h: refs/heads/master i:   270445:
 459f11c9abfd31f495efa8cb20833b8082037f51   270443:
 ed3bd386f57ca49414e0fffdfcb2e54b6693ad09   270439:
 caa02f77d33cc24a7d1d05e67b6c0759c4f95c26   270431:
 88ec6899b078982bf3e0c02150b72409e8997ec2 v: v3

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

diff --git a/[refs] b/[refs]
index 281fe7554383..8811f7afee41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e653510a27e63b41a5bae3c46eb093375e17ca2d
+refs/heads/master: d09c06c6fc240261dde65198774b279d89c35459
diff --git a/trunk/sound/usb/mixer.c b/trunk/sound/usb/mixer.c
index b13b7ac5bad9..60f65ace7474 100644
--- a/trunk/sound/usb/mixer.c
+++ b/trunk/sound/usb/mixer.c
@@ -1259,7 +1259,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
 				build_feature_ctl(state, _ftr, 0, i, &iterm, unitid, 0);
 		}
 	} else { /* UAC_VERSION_2 */
-		for (i = 0; i < 30/2; i++) {
+		for (i = 0; i < ARRAY_SIZE(audio_feature_info); i++) {
 			unsigned int ch_bits = 0;
 			unsigned int ch_read_only = 0;