From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.codeaurora.org by pdx-caf-mail.web.codeaurora.org (Dovecot) with LMTP id i/PrBCB4Hlv7MAAAmS7hNA ; Mon, 11 Jun 2018 13:24:48 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E8F47607A4; Mon, 11 Jun 2018 13:24:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by smtp.codeaurora.org (Postfix) with ESMTP id 680F8601C3; Mon, 11 Jun 2018 13:24:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 680F8601C3 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933180AbeFKNYp (ORCPT + 20 others); Mon, 11 Jun 2018 09:24:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:53203 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932607AbeFKNYo (ORCPT ); Mon, 11 Jun 2018 09:24:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B9B81AC44; Mon, 11 Jun 2018 13:24:42 +0000 (UTC) Date: Mon, 11 Jun 2018 15:24:42 +0200 Message-ID: From: Takashi Iwai To: "Andy Shevchenko" Cc: =?UTF-8?B?IsOJbWVyaWMgTUFTQ0hJTk8i?= , , , "BhumikaGoyal" , "Jaroslav Kysela" , 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > 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 > > --- > > 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 > Intel Finland Oy >