aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2014-10-19 03:11:25 -0400
committerTakashi Iwai <tiwai@suse.de>2014-10-19 05:36:25 -0400
commit49fd46d2ffc92de3f4bd2e337f60b8b6052dc8b6 (patch)
treedf98b26ad6cc5a39550c0f6e28693f0011f38e50 /sound/usb
parent70c84418bf74f582e29906f1eeb19f2e9da53ddd (diff)
ALSA: snd-usb: drop unused varible assigments
Don't assign 'len' in cases where we don't make use of the returned value. Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/mixer.c9
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,
1290 kctl->id.name, 1290 kctl->id.name,
1291 sizeof(kctl->id.name), 1); 1291 sizeof(kctl->id.name), 1);
1292 if (!len) 1292 if (!len)
1293 len = snprintf(kctl->id.name, 1293 snprintf(kctl->id.name, sizeof(kctl->id.name),
1294 sizeof(kctl->id.name), 1294 "Feature %d", unitid);
1295 "Feature %d", unitid);
1296 } 1295 }
1297 1296
1298 if (!mapped_name) 1297 if (!mapped_name)
@@ -1305,9 +1304,9 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
1305 */ 1304 */
1306 if (!mapped_name && !(state->oterm.type >> 16)) { 1305 if (!mapped_name && !(state->oterm.type >> 16)) {
1307 if ((state->oterm.type & 0xff00) == 0x0100) 1306 if ((state->oterm.type & 0xff00) == 0x0100)
1308 len = append_ctl_name(kctl, " Capture"); 1307 append_ctl_name(kctl, " Capture");
1309 else 1308 else
1310 len = append_ctl_name(kctl, " Playback"); 1309 append_ctl_name(kctl, " Playback");
1311 } 1310 }
1312 append_ctl_name(kctl, control == UAC_FU_MUTE ? 1311 append_ctl_name(kctl, control == UAC_FU_MUTE ?
1313 " Switch" : " Volume"); 1312 " Switch" : " Volume");