diff mbox

ALSA: sb_mixer: missing return statement

Message ID 20140514133221.GD14571@mwanda (mailing list archive)
State Accepted
Delegated to: Takashi Iwai
Headers show

Commit Message

Dan Carpenter May 14, 2014, 1:32 p.m. UTC 
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>

Comments

Takashi Iwai May 14, 2014, 2:47 p.m. UTC | #1 
At Wed, 14 May 2014 16:32:21 +0300,
Dan Carpenter wrote:
> 
> 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>

Thanks, applied.


Takashi

> 
> diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
> index 6496822..1ff78ec 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, "???");
>
diff mbox

Patch

diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
index 6496822..1ff78ec 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, "???");