From patchwork Thu Jun 11 08:04:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Johan_Rast=C3=A9n?= X-Patchwork-Id: 6586381 X-Patchwork-Delegate: tiwai@suse.de Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CA269C0020 for ; Thu, 11 Jun 2015 08:06:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 048B52060E for ; Thu, 11 Jun 2015 08:06:27 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D541A20605 for ; Thu, 11 Jun 2015 08:06:25 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0952F265831; Thu, 11 Jun 2015 10:06:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E14A82625FE; Thu, 11 Jun 2015 10:06:11 +0200 (CEST) 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 AE3ED2625FF; Thu, 11 Jun 2015 10:06:10 +0200 (CEST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by alsa0.perex.cz (Postfix) with ESMTP id 86868261B36; Thu, 11 Jun 2015 10:06:03 +0200 (CEST) Received: by lbbqq2 with SMTP id qq2so40526282lbb.3; Thu, 11 Jun 2015 01:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=Kb6avmCwd6juK8hgTc6HOWuC8VcrSeuTnQCoZmkMqEE=; b=PQc1mcXNadd4Wi3X/gDO3xpgoJG1mOQpalTCrkZlWRIcXxIPy7gUIJiJ64ZCh/5Y3V oP38TFkgm5bkURVXx0MqTIaFhAgh2iJWZgYDqOIz3ZxV65kVvH15boLAbx8DqSoWb1OB S5CcPk5Y5oXaYMXjbEXqvXYNvqNJFPY3suVI6X/o9KKACOPkbPEyPEtbDVlPdhIZ17gO ZuExxp/fh0Y5aDMz59aUV796yPvyyRz7mWAkVASJl5suzfdhQhUKspyEq9xqymA2JlEy kUyZUxtsPuUHocWx8KbI9Y1ej4MjdKMQi2hkjf1SnHcH3spycJ6PwZPZgbZ8lLeG6XI1 94hQ== X-Received: by 10.112.125.166 with SMTP id mr6mr8452045lbb.83.1434009963067; Thu, 11 Jun 2015 01:06:03 -0700 (PDT) Received: from localhost.localdomain (h-140-62.a357.priv.bahnhof.se. [85.24.140.62]) by mx.google.com with ESMTPSA id xf5sm2835523lbb.7.2015.06.11.01.06.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Jun 2015 01:06:02 -0700 (PDT) From: =?UTF-8?q?Johan=20Rast=C3=A9n?= To: patch@alsa-project.org Date: Thu, 11 Jun 2015 10:04:51 +0200 Message-Id: <1434009891-16276-1-git-send-email-johan@oljud.se> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, =?UTF-8?q?Johan=20Rast=C3=A9n?= Subject: [alsa-devel] [PATCH 1/1] usb-audio: Set correct type for some UAC2 mixer controls. 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Changed ctl type for Input Gain Control and Input Gain Pad Control to USB_MIXER_S16 as per section 5.2.5.7.11-12 in the USB Audio Class 2.0 definition. Signed-off-by: Johan Rastén diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 8b7e391..6b3acba 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -809,12 +809,12 @@ static struct usb_feature_control_info audio_feature_info[] = { { "Tone Control - Treble", USB_MIXER_S8 }, { "Graphic Equalizer", USB_MIXER_S8 }, /* FIXME: not implemeted yet */ { "Auto Gain Control", USB_MIXER_BOOLEAN }, - { "Delay Control", USB_MIXER_U16 }, + { "Delay Control", USB_MIXER_U16 }, /* FIXME: U32 in UAC2 */ { "Bass Boost", USB_MIXER_BOOLEAN }, { "Loudness", USB_MIXER_BOOLEAN }, /* UAC2 specific */ - { "Input Gain Control", USB_MIXER_U16 }, - { "Input Gain Pad Control", USB_MIXER_BOOLEAN }, + { "Input Gain Control", USB_MIXER_S16 }, + { "Input Gain Pad Control", USB_MIXER_S16 }, { "Phase Inverter Control", USB_MIXER_BOOLEAN }, };