ALSA: sb_mixer: missing return statement
Subsystems (2)
PATCH 1/1 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 <[email protected]>
sound/isa/sb/sb_mixer.c +8 -6
@@ -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,"???" );
Takashi Iwai
AppliedAt Wed, 14 May 2014 16:32:21 +0300,
Quoted 6 lines · Dan Carpenter
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 <[email protected]>
Thanks, applied.
Takashi
Quoted 27 lines
sound/isa/sb/sb_mixer.c +8
-6@@ -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,"???" );