diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-05-14 16:32:21 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-14 16:46:48 +0200 |
| commit | 665ebe926e7b714369b5329d48745bfef17db512 (patch) | |
| tree | 65489f45d3db7bb1bc361d09093d5444f057b1ed /sound/isa/sb/sb_mixer.c | |
| parent | ff2354bc6e54cc7e024744b7b4065a081fd87f6e (diff) | |
| download | linux-stable-665ebe926e7b714369b5329d48745bfef17db512.tar.gz linux-stable-665ebe926e7b714369b5329d48745bfef17db512.tar.bz2 linux-stable-665ebe926e7b714369b5329d48745bfef17db512.zip | |
ALSA: sb_mixer: missing return statement
The if condition here was supposed to return on error but the return
statement is missing. The effect is that the ->mixername is set to
"???" instead of "DT019X".
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/sb/sb_mixer.c')
| -rw-r--r-- | sound/isa/sb/sb_mixer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c index 6496822c1808..1ff78ec9f0ac 100644 --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c @@ -818,12 +818,14 @@ int snd_sbmixer_new(struct snd_sb *chip) return err; break; case SB_HW_DT019X: - if ((err = snd_sbmixer_init(chip, - snd_dt019x_controls, - ARRAY_SIZE(snd_dt019x_controls), - snd_dt019x_init_values, - ARRAY_SIZE(snd_dt019x_init_values), - "DT019X")) < 0) + err = snd_sbmixer_init(chip, + snd_dt019x_controls, + ARRAY_SIZE(snd_dt019x_controls), + snd_dt019x_init_values, + ARRAY_SIZE(snd_dt019x_init_values), + "DT019X"); + if (err < 0) + return err; break; default: strcpy(card->mixername, "???"); |