From patchwork Wed Nov 29 21:43:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamaki Nishino X-Patchwork-Id: 10084313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 40AB36035E for ; Thu, 30 Nov 2017 07:53:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 330DF29ECA for ; Thu, 30 Nov 2017 07:53:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 282D829EE5; Thu, 30 Nov 2017 07:53:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9501F29ECA for ; Thu, 30 Nov 2017 07:53:15 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A3C0A267A8F; Thu, 30 Nov 2017 08:53:01 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id E9FD22679A5; Wed, 29 Nov 2017 22:43:56 +0100 (CET) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by alsa0.perex.cz (Postfix) with ESMTP id 7E1AC267960; Wed, 29 Nov 2017 22:43:53 +0100 (CET) Received: by mail-pl0-f65.google.com with SMTP id x22so2884240pln.11; Wed, 29 Nov 2017 13:43:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=n/4B0xqImxwka27igvtqW9cpjZ5CRfGEkb5CSBLZ9mU=; b=D/BW4EqDykTQUfn4bkzW41SZzJvMdtEqua3mBq5ez2FQBjtYFXJh5yGyfRx3V2+JP8 9RqFMHnQEaQNcLPYS/23CQgf1hVCy4loV2dS8cYG7nCXriPk2jgzryJgIvk2s+MNku5t DoRAZ5DDx/pUvCgmgD8JlqeDLm3lkBFZDe2N7fGPeAElhj/NYmve9D0YRFkWVIhaKHIC j8Rv3VwSvVlIii4WfnT0LuoA6qN6/HI8v4I+GnnGMlx3kD927elflSXVlmkIRzfdN6of u2iS81uS1rK0TkddaL3HPdOKS/FoRPOAOKRD3rgqXxYeyjQl3ssOgXnlmtxWUzA+7tIF SMMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=n/4B0xqImxwka27igvtqW9cpjZ5CRfGEkb5CSBLZ9mU=; b=ixRA/VbmCnyOLF4QnfT7FwK7VLX6ISY55F18vj3sfd6ZIcpzsE9vbn00QSbiiYcgs2 fCgCanL5ms0z8PRnZS+Hu2guku3v/swZ0VpBJll83ByCJPSKWVtRHLSHoEiFTyg+tR8J yJFDpKet7BIS3fVR707irSPA9w9ROXDcSdb1+b6SpbbjNUF/2gNWS3363Rc4yX3wuhcF JiWAxqBzXz1odMoc33B/A+GjBVVqszV0IEJUaXplmIK/8C2kQkdpfmN0U86jvg9GCWvq 6ccBFmiJ9FEhD7XVpERShQDX9wH8tPdnsfFPCIbBEXd3WSqjRl2ENjJPB4h0fjcRYU89 czHA== X-Gm-Message-State: AJaThX6hDX3HcEJbpIuVKdjLj1BiCrorCHuccgyIwdrRNMs3G5xWfoTw HbHBnDMAdcmJkJZ13BlPC+CUBS+m1YA= X-Google-Smtp-Source: AGs4zMab8rza0Dp/NV/dwacMSkL0dbc3sTCHaaEQGOeATLcfEfbq72PSLDRWfAs6YeJdQ+TnoLW10g== X-Received: by 10.84.135.101 with SMTP id 92mr306397pli.172.1511991831756; Wed, 29 Nov 2017 13:43:51 -0800 (PST) Received: from localhost ([240b:251:24a0:7100:68e6:792e:9332:4be5]) by smtp.gmail.com with ESMTPSA id i16sm4294722pgv.46.2017.11.29.13.43.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 13:43:50 -0800 (PST) From: Tamaki Nishino To: patch@alsa-project.org Date: Thu, 30 Nov 2017 06:43:30 +0900 Message-Id: <1511991810-1868-1-git-send-email-otamachan@gmail.com> X-Mailer: git-send-email 2.7.4 X-Mailman-Approved-At: Thu, 30 Nov 2017 08:52:57 +0100 Cc: alsa-devel@alsa-project.org, Tamaki Nishino Subject: [alsa-devel] [PATCH] ALSA: usb-audio: Fix the enable parameter behavior X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The enable parameter doesn't seem to work as expected. Even when the enable parameter is set to false in /etc/modprobe.d/alsa-base.conf like "options snd-usb-audio index=-2 vid=0x1415 pid=0x1d27 enable=0", the specified device is not disabled. This patch fixes the enable parameter behavior to disable the device correctly. Signed-off-by: Tamaki Nishino --- sound/usb/card.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 23d1d23..8018d56 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -585,15 +585,24 @@ static int usb_audio_probe(struct usb_interface *intf, * now look for an empty slot and create a new card instance */ for (i = 0; i < SNDRV_CARDS; i++) - if (enable[i] && ! usb_chip[i] && + if (!usb_chip[i] && (vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) && (pid[i] == -1 || pid[i] == USB_ID_PRODUCT(id))) { - err = snd_usb_audio_create(intf, dev, i, quirk, - id, &chip); - if (err < 0) + if (enable[i]) { + err = snd_usb_audio_create(intf, dev, i, quirk, + id, &chip); + if (err < 0) + goto __error; + chip->pm_intf = intf; + break; + } else if (vid[i] != -1 || pid[i] != -1) { + dev_info(&dev->dev, + "device (%04x:%04x) is disabled\n", + USB_ID_VENDOR(id), + USB_ID_PRODUCT(id)); + err = -ENOENT; goto __error; - chip->pm_intf = intf; - break; + } } if (!chip) { dev_err(&dev->dev, "no available usb audio device\n");