* [patch] ALSA: sb_mixer: missing return statement
@ 2014-05-14 13:32 Dan Carpenter
2014-05-14 14:47 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2014-05-14 13:32 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: Takashi Iwai, alsa-devel, linux-kernel, kernel-janitors
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>
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, "???");
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] ALSA: sb_mixer: missing return statement
2014-05-14 13:32 [patch] ALSA: sb_mixer: missing return statement Dan Carpenter
@ 2014-05-14 14:47 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2014-05-14 14:47 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Jaroslav Kysela, alsa-devel, linux-kernel, kernel-janitors
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, "???");
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-14 14:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-14 13:32 [patch] ALSA: sb_mixer: missing return statement Dan Carpenter
2014-05-14 14:47 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox