From patchwork Tue Nov 22 09:04:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Krutak X-Patchwork-Id: 9440639 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 5222A60235 for ; Tue, 22 Nov 2016 09:08:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4224924B48 for ; Tue, 22 Nov 2016 09:08:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36F2128481; Tue, 22 Nov 2016 09:08:21 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,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 8DCF024B48 for ; Tue, 22 Nov 2016 09:08:19 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 02A52266CB9; Tue, 22 Nov 2016 10:08:17 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 1438C266849; Tue, 22 Nov 2016 10:05:52 +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 BD635266A0A; Tue, 22 Nov 2016 10:05:42 +0100 (CET) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by alsa0.perex.cz (Postfix) with ESMTP id AA553266849 for ; Tue, 22 Nov 2016 10:05:37 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id a20so2210701wme.2 for ; Tue, 22 Nov 2016 01:05:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=sVgU8IuRyVo5/MFSkjxnUgVG9gxXUvw7FBcuwORvlCI=; b=V2G/oOhZc/RcdQEBtAItlMYmmGiL24h0Q/rpMGChsFSKzXxsqW7uUO5v8P3H58HlTe EN3BnbPNE0+MuprT6MZ9z9MQgILw1zJfhjVBbISRT5YokO9UEElXuTuVaFgIGoPpvfgG BXFsU4hw1B9DJ2eRDA94ZfViFPZMzjWuZp+T58F1m7MLtGJAJs/2RPjZNKcnwUxHqFqu AGW2nikz6Mxfk+h5zKWj4fzicVEfwp/s+7NenRWug7ly+5WQM+ePHh295cfl6uTINq8V scMlvpgstIr1bbmR9AJSETUvM4cByoRBYv9dkseKAGB06lKRBRGGrStcXx5EctFYiBbc 1k5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=sVgU8IuRyVo5/MFSkjxnUgVG9gxXUvw7FBcuwORvlCI=; b=IQ/lzzk1bygMIGZkEv1muVpsvmg8ORUu2FgOdNAiJd8A6pWWLeO11MZo2wcUj9q1/q WIdA/T5HOBPxqvY899UXcSgotf0q9TMVfHVQchpWxoJ8NzAFzqmLYGtnkFL6Tt18NWvn rUGjqGLFe0FrUUv6NDs4h2FBWWiR3WHRUMke3DRiP85KVo6Em78DiDQrvrLClDB4Tm0U O8ENh9KSNJS3Mk2AKjwgR5z3+N0Ta3OEbBmPq+AwYCsLUq3CpU0QiluKu3alT80of98+ HrBM/x8JJYKHw5rfV5ikpDpDVT6ItmkOQlw70DYG8kpcYX+inDEM+cYn+/7LA5FBaFf9 NMMw== X-Gm-Message-State: AKaTC03s6dJ3mN6p2ugl+IYU+gtwYGtYhyervdpKBIJnxJboFCzyekBVQmws21Wfxh0r6Q== X-Received: by 10.28.36.87 with SMTP id k84mr1352413wmk.64.1479805537073; Tue, 22 Nov 2016 01:05:37 -0800 (PST) Received: from localhost.localdomain ([217.30.74.231]) by smtp.gmail.com with ESMTPSA id im3sm29687638wjb.13.2016.11.22.01.05.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 01:05:35 -0800 (PST) From: Andrej Krutak To: tiwai@suse.com, perex@perex.cz, stefanha@gmail.com, grabner@icg.tugraz.at, alsa-devel@alsa-project.org Date: Tue, 22 Nov 2016 10:04:02 +0100 Message-Id: <1479805444-11819-1-git-send-email-dev@andree.sk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1479556889-17601-1-git-send-email-dev@andree.sk> References: <1479556889-17601-1-git-send-email-dev@andree.sk> Cc: Andrej Krutak Subject: [alsa-devel] [PATCH v2] ALSA: line6: Claim POD X3 USB data interface 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 Userspace apps have to claim USB interfaces before using endpoints in them (drivers/usb/core/devio.c:checkintf()). It's a lock mechanism so that two "drivers" don't steal data from each other. Kernel drivers don't have to claim interfaces to work - but they should, to lock out userspace... Signed-off-by: Andrej Krutak --- sound/usb/line6/driver.h | 1 + sound/usb/line6/podhd.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index 7e3a3aa..5d18957 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -98,6 +98,7 @@ struct line6_properties { int altsetting; + unsigned ctrl_if; unsigned ep_ctrl_r; unsigned ep_ctrl_w; unsigned ep_audio_r; diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 49cd4a6..6c53b87 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -153,6 +153,7 @@ struct usb_line6_podhd { .rats = &podhd_ratden}, .bytes_per_channel = 3 /* SNDRV_PCM_FMTBIT_S24_3LE */ }; +static struct usb_driver podhd_driver; static void podhd_startup_start_workqueue(unsigned long data); static void podhd_startup_workqueue(struct work_struct *work); @@ -291,8 +292,13 @@ static void podhd_disconnect(struct usb_line6 *line6) struct usb_line6_podhd *pod = (struct usb_line6_podhd *)line6; if (pod->line6.properties->capabilities & LINE6_CAP_CONTROL) { + struct usb_interface *intf; + del_timer_sync(&pod->startup_timer); cancel_work_sync(&pod->startup_work); + + intf = usb_ifnum_to_if(line6->usbdev, pod->line6.properties->ctrl_if); + usb_driver_release_interface(&podhd_driver, intf); } } @@ -304,10 +310,26 @@ static int podhd_init(struct usb_line6 *line6, { int err; struct usb_line6_podhd *pod = (struct usb_line6_podhd *) line6; + struct usb_interface *intf; line6->disconnect = podhd_disconnect; if (pod->line6.properties->capabilities & LINE6_CAP_CONTROL) { + /* claim the data interface */ + intf = usb_ifnum_to_if(line6->usbdev, pod->line6.properties->ctrl_if); + if (!intf) { + dev_err(pod->line6.ifcdev, "interface %d not found\n", + pod->line6.properties->ctrl_if); + return -ENODEV; + } + + err = usb_driver_claim_interface(&podhd_driver, intf, NULL); + if (err != 0) { + dev_err(pod->line6.ifcdev, "can't claim interface %d, error %d\n", + pod->line6.properties->ctrl_if, err); + return err; + } + /* create sysfs entries: */ err = snd_card_add_dev_attr(line6->card, &podhd_dev_attr_group); if (err < 0) @@ -406,6 +428,7 @@ static int podhd_init(struct usb_line6 *line6, .altsetting = 1, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, + .ctrl_if = 1, .ep_audio_r = 0x86, .ep_audio_w = 0x02, }, @@ -417,6 +440,7 @@ static int podhd_init(struct usb_line6 *line6, .altsetting = 1, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, + .ctrl_if = 1, .ep_audio_r = 0x86, .ep_audio_w = 0x02, },