From patchwork Thu Aug 18 22:20:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Krutak X-Patchwork-Id: 9288677 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 5D0C7600CB for ; Thu, 18 Aug 2016 22:25:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BFF429212 for ; Thu, 18 Aug 2016 22:25:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4094B29256; Thu, 18 Aug 2016 22:25:58 +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_SIGNED, 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 7B41929249 for ; Thu, 18 Aug 2016 22:25:57 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 80CCB266BD3; Fri, 19 Aug 2016 00:25:56 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 13209266BD5; Fri, 19 Aug 2016 00:22:32 +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 D4F61266569; Fri, 19 Aug 2016 00:22:27 +0200 (CEST) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by alsa0.perex.cz (Postfix) with ESMTP id B8DD426657A for ; Fri, 19 Aug 2016 00:21:49 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id i5so1278222wmg.2 for ; Thu, 18 Aug 2016 15:21:49 -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:in-reply-to:references; bh=sTUyqSrRSfwoXb0RMscJhow/V5/95Pz5dShz1B7doX8=; b=Gp+qX/jRdOMpD0TzeE6K7P6k3J73Kgl3jscvXBU7xkFYWvBBNwM4cWU5nr9v+wm0a6 +RxOIabjh0t2SFKjURmwGmloMjlj3ZBzUKOtGcH8QDCHe5dwnZrqfqmy5yUGIJJY1yQp FoDsSXhotYBB044g5saJF9V2dWgOq4sw6/6NKCKkqM8b/u0vxd1OoQFW3j/BiQXmhyJN OrzrSX2xTRZFVqmYEr5JhFJpKI5ciVPQVkDXoh6NP8cFZrxnKiJPmpufpTS9oLAAIfZE mYi58yDGT4RDC63XPvJ5vUd/1y4SFvM2T9MFViYDoE/oMKWng5h/b7sDSXJ3cEZtsVjK obwg== 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=sTUyqSrRSfwoXb0RMscJhow/V5/95Pz5dShz1B7doX8=; b=Is+hxLnn7JyPoFjNlsoX+9hk01hixTNyfaJf5gNnk1IhuElKdhNG4dj4yMkq7frgsl RXULclqBQkvfUfJIytM7KiV4ZPPHZBznOebmgvewI0xUNL8QGWYq1SJ1uReVejc9fp9+ rAWTlJFoJF+1cCjzzmdxeikEGDZ18r2ap5f15OCk/RFuCRdjLeHyrvOz3WvgJUZnQhLp RiS9Eddbkz6z/kad0iv8ayZHBwlW/HL8BUSTnB5wJOqZ6pyRx+wVJzYsGHZu+54IxxEh WTOyKnTcJO+KYnjH0DEx55GzvpYDjovmI5zQ7HhuxjQ1ABp+Ll8pNvIcAruaWhkSjqty +4Gg== X-Gm-Message-State: AEkooutse+AZZc28xwS+a7AbvJuXZQbRQW/5ECN6QfALH9zroU+8LVQh48AxKaYROa1/jw== X-Received: by 10.28.22.70 with SMTP id 67mr1325336wmw.52.1471558909455; Thu, 18 Aug 2016 15:21:49 -0700 (PDT) Received: from andree.lan ([217.30.74.231]) by smtp.gmail.com with ESMTPSA id jv9sm4122380wjb.45.2016.08.18.15.21.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Aug 2016 15:21:48 -0700 (PDT) From: Andrej Krutak To: tiwai@suse.com, perex@perex.cz, stefanha@gmail.com, grabner@icg.tugraz.at, alsa-devel@alsa-project.org Date: Fri, 19 Aug 2016 00:20:38 +0200 Message-Id: <1471558839-14120-9-git-send-email-dev@andree.sk> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471558839-14120-1-git-send-email-dev@andree.sk> References: <1470942147-19848-1-git-send-email-dev@andree.sk> <1471558839-14120-1-git-send-email-dev@andree.sk> Cc: Andrej Krutak Subject: [alsa-devel] [PATCH v2 8/9] ALSA: line6: Cleanup initialization 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 Only determine control port properties if the devices needs it. Only initialize PCM for POD HD devices that support it. No POD HD seems to support MIDI, thus drop the initialization. Signed-off-by: Andrej Krutak --- sound/usb/line6/driver.c | 3 +-- sound/usb/line6/podhd.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 853a143..8a71d45 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -612,9 +612,8 @@ int line6_probe(struct usb_interface *interface, goto error; } - line6_get_interval(line6); - if (properties->capabilities & LINE6_CAP_CONTROL) { + line6_get_interval(line6); ret = line6_init_cap_control(line6); if (ret < 0) goto error; diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 8246ea5..193eb29 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -314,17 +314,14 @@ static int podhd_init(struct usb_line6 *line6, return err; } - /* initialize MIDI subsystem: */ - err = line6_init_midi(line6); - if (err < 0) - return err; - - /* initialize PCM subsystem: */ - err = line6_init_pcm(line6, - (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : - &podhd_pcm_properties); - if (err < 0) - return err; + if (pod->line6.properties->capabilities & LINE6_CAP_PCM) { + /* initialize PCM subsystem: */ + err = line6_init_pcm(line6, + (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : + &podhd_pcm_properties); + if (err < 0) + return err; + } if (!(pod->line6.properties->capabilities & LINE6_CAP_CONTROL)) { /* register USB audio system directly */