diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-05-14 09:32:21 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-14 10:46:48 -0400 |
| commit | 665ebe926e7b714369b5329d48745bfef17db512 (patch) | |
| tree | 65489f45d3db7bb1bc361d09093d5444f057b1ed /sound/isa | |
| parent | ff2354bc6e54cc7e024744b7b4065a081fd87f6e (diff) | |
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')
| -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) | |||
| 818 | return err; | 818 | return err; |
| 819 | break; | 819 | break; |
| 820 | case SB_HW_DT019X: | 820 | case SB_HW_DT019X: |
| 821 | if ((err = snd_sbmixer_init(chip, | 821 | err = snd_sbmixer_init(chip, |
| 822 | snd_dt019x_controls, | 822 | snd_dt019x_controls, |
| 823 | ARRAY_SIZE(snd_dt019x_controls), | 823 | ARRAY_SIZE(snd_dt019x_controls), |
| 824 | snd_dt019x_init_values, | 824 | snd_dt019x_init_values, |
| 825 | ARRAY_SIZE(snd_dt019x_init_values), | 825 | ARRAY_SIZE(snd_dt019x_init_values), |
| 826 | "DT019X")) < 0) | 826 | "DT019X"); |
| 827 | if (err < 0) | ||
| 828 | return err; | ||
| 827 | break; | 829 | break; |
| 828 | default: | 830 | default: |
| 829 | strcpy(card->mixername, "???"); | 831 | strcpy(card->mixername, "???"); |