From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: [PATCH v2] ALSA: core: release the constraint
	check for replace ops
Date: Wed, 24 Aug 2011 10:41:07 +0200
Message-ID: <s5hhb57p5gc.wl%tiwai@suse.de>
References: <20110824060854.GE3551@guanqun-laptop.sh.intel.com>
	<20110824064509.7162.39455.stgit@localhost6.localdomain6>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15])
	by alsa0.perex.cz (Postfix) with ESMTP id 77CF524939
	for <alsa-devel@alsa-project.org>;
	Wed, 24 Aug 2011 10:41:07 +0200 (CEST)
In-Reply-To: <20110824064509.7162.39455.stgit@localhost6.localdomain6>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Sender: alsa-devel-bounces@alsa-project.org
Errors-To: alsa-devel-bounces@alsa-project.org
To: Lu Guanqun <guanqun.lu@intel.com>
Cc: ALSA <alsa-devel@alsa-project.org>
List-Id: alsa-devel@alsa-project.org

At Wed, 24 Aug 2011 14:45:10 +0800,
Lu Guanqun wrote:
> 
> Suppose the ALSA card already has a number of MAX_USER_CONTROLS controls, and
> the user wants to replace one, it should not fail at this condition check.
> 
> Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>

Thanks, applied.


Takashi

> ---
>  sound/core/control.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/core/control.c b/sound/core/control.c
> index 7f2b3a7..dc2a440 100644
> --- a/sound/core/control.c
> +++ b/sound/core/control.c
> @@ -1073,7 +1073,7 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,
>  	struct user_element *ue;
>  	int idx, err;
>  
> -	if (card->user_ctl_count >= MAX_USER_CONTROLS)
> +	if (!replace && card->user_ctl_count >= MAX_USER_CONTROLS)
>  		return -ENOMEM;
>  	if (info->count < 1)
>  		return -EINVAL;
>