From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754211AbaENOrM (ORCPT <rfc822;w@1wt.eu>);
	Wed, 14 May 2014 10:47:12 -0400
Received: from cantor2.suse.de ([195.135.220.15]:54504 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751073AbaENOrK (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 14 May 2014 10:47:10 -0400
Date: Wed, 14 May 2014 16:47:08 +0200
Message-ID: <s5hegzwh0yb.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Jaroslav Kysela <perex@perex.cz>, alsa-devel@alsa-project.org,
        linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] ALSA: sb_mixer: missing return statement
In-Reply-To: <20140514133221.GD14571@mwanda>
References: <20140514133221.GD14571@mwanda>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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, "???");
>