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;