Loading sound/usb/mixer.c +4 −5 Original line number Original line Diff line number Diff line Loading @@ -1290,8 +1290,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, kctl->id.name, kctl->id.name, sizeof(kctl->id.name), 1); sizeof(kctl->id.name), 1); if (!len) if (!len) len = snprintf(kctl->id.name, snprintf(kctl->id.name, sizeof(kctl->id.name), sizeof(kctl->id.name), "Feature %d", unitid); "Feature %d", unitid); } } Loading @@ -1305,9 +1304,9 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, */ */ if (!mapped_name && !(state->oterm.type >> 16)) { if (!mapped_name && !(state->oterm.type >> 16)) { if ((state->oterm.type & 0xff00) == 0x0100) if ((state->oterm.type & 0xff00) == 0x0100) len = append_ctl_name(kctl, " Capture"); append_ctl_name(kctl, " Capture"); else else len = append_ctl_name(kctl, " Playback"); append_ctl_name(kctl, " Playback"); } } append_ctl_name(kctl, control == UAC_FU_MUTE ? append_ctl_name(kctl, control == UAC_FU_MUTE ? " Switch" : " Volume"); " Switch" : " Volume"); Loading Loading
sound/usb/mixer.c +4 −5 Original line number Original line Diff line number Diff line Loading @@ -1290,8 +1290,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, kctl->id.name, kctl->id.name, sizeof(kctl->id.name), 1); sizeof(kctl->id.name), 1); if (!len) if (!len) len = snprintf(kctl->id.name, snprintf(kctl->id.name, sizeof(kctl->id.name), sizeof(kctl->id.name), "Feature %d", unitid); "Feature %d", unitid); } } Loading @@ -1305,9 +1304,9 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, */ */ if (!mapped_name && !(state->oterm.type >> 16)) { if (!mapped_name && !(state->oterm.type >> 16)) { if ((state->oterm.type & 0xff00) == 0x0100) if ((state->oterm.type & 0xff00) == 0x0100) len = append_ctl_name(kctl, " Capture"); append_ctl_name(kctl, " Capture"); else else len = append_ctl_name(kctl, " Playback"); append_ctl_name(kctl, " Playback"); } } append_ctl_name(kctl, control == UAC_FU_MUTE ? append_ctl_name(kctl, control == UAC_FU_MUTE ? " Switch" : " Volume"); " Switch" : " Volume"); Loading