diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 08:44:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-20 08:44:25 +0200 |
| commit | e20095367325b1307f199fb0f193816209f12514 (patch) | |
| tree | 32d0e1e92b60c084e7b487a9dad44b968633388e /sound/usb | |
| parent | 6acce400d9daf1353fbf497302670c90a3205e1d (diff) | |
| parent | 49fd46d2ffc92de3f4bd2e337f60b8b6052dc8b6 (diff) | |
| download | linux-e20095367325b1307f199fb0f193816209f12514.tar.gz | |
Merge branch 'topic/cleanup' into for-next
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 2e4a9dbc51fa..63a8adb1705e 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1290,9 +1290,8 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, kctl->id.name, sizeof(kctl->id.name), 1); if (!len) - len = snprintf(kctl->id.name, - sizeof(kctl->id.name), - "Feature %d", unitid); + snprintf(kctl->id.name, sizeof(kctl->id.name), + "Feature %d", unitid); } if (!mapped_name) @@ -1305,9 +1304,9 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, */ if (!mapped_name && !(state->oterm.type >> 16)) { if ((state->oterm.type & 0xff00) == 0x0100) - len = append_ctl_name(kctl, " Capture"); + append_ctl_name(kctl, " Capture"); else - len = append_ctl_name(kctl, " Playback"); + append_ctl_name(kctl, " Playback"); } append_ctl_name(kctl, control == UAC_FU_MUTE ? " Switch" : " Volume"); |