From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lu Guanqun Subject: [PATCH 2/3] ALSA: core: release the constraint check for replace ops Date: Wed, 24 Aug 2011 11:12:39 +0800 Message-ID: <20110824031239.5279.97696.stgit@localhost6.localdomain6> References: <20110824031234.5279.46501.stgit@localhost6.localdomain6> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by alsa0.perex.cz (Postfix) with ESMTP id D804A245A5 for ; Wed, 24 Aug 2011 05:12:38 +0200 (CEST) In-Reply-To: <20110824031234.5279.46501.stgit@localhost6.localdomain6> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Takashi Iwai , ALSA , clemens@ladisch.de List-Id: alsa-devel@alsa-project.org 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 --- 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..98b7fc7 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 (card->user_ctl_count >= MAX_USER_CONTROLS + !!replace) return -ENOMEM; if (info->count < 1) return -EINVAL;