Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 11 Jun 2018 15:24:42 +0200
Message-ID: <s5hmuw1bgmd.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>
Cc:     =?UTF-8?B?IsOJbWVyaWMgTUFTQ0hJTk8i?= <emeric.maschino@gmail.com>,
        <jiazhouyang09@gmail.com>, <alsa-devel@alsa-project.org>,
        "BhumikaGoyal" <bhumirks@gmail.com>,
        "Jaroslav Kysela" <perex@perex.cz>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ALSA: fm801: add error handling for snd_ctl_add
In-Reply-To: <520e80a8b8de0f532e8dd3ee15af9efbc748dd9a.camel@linux.intel.com>
References: <1528704248-33818-1-git-send-email-jiazhouyang09@gmail.com>
        <520e80a8b8de0f532e8dd3ee15af9efbc748dd9a.camel@linux.intel.com>
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/25.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=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, 11 Jun 2018 10:49:56 +0200,
Andy Shevchenko wrote:
> 
> On Mon, 2018-06-11 at 16:04 +0800, jiazhouyang09@gmail.com wrote:
> > When snd_ctl_add fails, the lack of error-handling code may
> > cause unexpected results.
> > 
> > This patch adds error-handling code after calling snd_ctl_add.
> > 
> 
> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> Though I can't test this (I have FM-only card). Last person who would
> able to test was Émeric (Cc'ed).

I applied now as this change is pretty safe.


thanks,

Takashi

> 
> > Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
> > ---
> >  sound/pci/fm801.c | 16 ++++++++++++----
> >  1 file changed, 12 insertions(+), 4 deletions(-)
> > 
> > diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
> > index 73a67bc..e3fb9c6 100644
> > --- a/sound/pci/fm801.c
> > +++ b/sound/pci/fm801.c
> > @@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip)
> >  		if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97,
> > &chip->ac97_sec)) < 0)
> >  			return err;
> >  	}
> > -	for (i = 0; i < FM801_CONTROLS; i++)
> > -		snd_ctl_add(chip->card,
> > snd_ctl_new1(&snd_fm801_controls[i], chip));
> > +	for (i = 0; i < FM801_CONTROLS; i++) {
> > +		err = snd_ctl_add(chip->card,
> > +			snd_ctl_new1(&snd_fm801_controls[i], chip));
> > +		if (err < 0)
> > +			return err;
> > +	}
> >  	if (chip->multichannel) {
> > -		for (i = 0; i < FM801_CONTROLS_MULTI; i++)
> > -			snd_ctl_add(chip->card,
> > snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
> > +		for (i = 0; i < FM801_CONTROLS_MULTI; i++) {
> > +			err = snd_ctl_add(chip->card,
> > +				snd_ctl_new1(&snd_fm801_controls_mult
> > i[i], chip));
> > +			if (err < 0)
> > +				return err;
> > +		}
> >  	}
> >  	return 0;
> >  }
> 
> -- 
> Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Intel Finland Oy
>