From patchwork Thu Aug 11 19:02:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Krutak X-Patchwork-Id: 9275903 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 9D5D96022E for ; Thu, 11 Aug 2016 19:55:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B1A228780 for ; Thu, 11 Aug 2016 19:55:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FACF28788; Thu, 11 Aug 2016 19:55:56 +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 C22E928780 for ; Thu, 11 Aug 2016 19:55:55 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id CEB77267E91; Thu, 11 Aug 2016 21:55:54 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 12996267AEC; Thu, 11 Aug 2016 21:42:07 +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 CBCAB267754; Thu, 11 Aug 2016 21:42:02 +0200 (CEST) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by alsa0.perex.cz (Postfix) with ESMTP id EDA4E267752 for ; Thu, 11 Aug 2016 21:04:03 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id i138so920798wmf.3 for ; Thu, 11 Aug 2016 12:04: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:in-reply-to:references; bh=AcNwT5lVFAVdZJacv38tKXzWPBlXbEyQaLaBcgJlKOs=; b=uPQNCPuayzyUQACZfcGwEkVUt9ZXkuo1liLv3XqK2xD15KIcJ2tSVuOtoNim3xrKr8 UEg+0YB8gV11XFW1FtzCjHpOSQ/lz0KPF7NlLaE3gLvjbhL9dHpKNaM9B22A495gRIgt LXSovJsK/n2fdd3pKbS2mg9E6HI5vBRll+yBnn2Wq4QCuhWG36wOiHtGJQMNqkcgmZHi EGnW3YgBz6mFoDGL7dOyZMHvd0A0VBs3Sp6INtTiyVCcJH5wwdWaxrih8krvYy4tlrzV 3CqJnIjtw8vWgkqJ/e5GSnU8jGo+ill+x1GBgHxCevZA31jeLk/nYEeXRR6gPIzirjd3 JNlA== 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=AcNwT5lVFAVdZJacv38tKXzWPBlXbEyQaLaBcgJlKOs=; b=a4CYRPuL7D8w+oKYQA0FZBogeXK9Gucw311ih+p+tK44q/RhWBuBu6VS2dnEy7nKPm tjKpVJpXkjLGJlTts5Q/p+FGb7Z8H0iMwlBjthl5jAlylTXLqWVgTVbvhQZDUcftgyP0 Myug8DirjoTyE5NOdT1Oxx+lo9Y9EXjEbIyR+7ScK73ASaWjnNkHoexVl7SFh14Tw3yD 65KBYcyBcS1/HP5he+qIiWjaGozecTHLlIn3IY1iwuJJXJuJJdKL3NM2LYHFnLpwIAyS ZDCnUsaLON3F50sbxmJhAaQxHK6cR9/V+PhDe/J/g0/Bhxs3pZW2Tjyb8v4HQ6lCFSC1 817w== X-Gm-Message-State: AEkoouvg4PW89WbLZ/lby4kgI1tzJVI8pt9UGwStFkfQHGtjdOGJQQaOCRRWShDJ4+vd6g== X-Received: by 10.28.126.75 with SMTP id z72mr10529936wmc.74.1470942243446; Thu, 11 Aug 2016 12:04:03 -0700 (PDT) Received: from localhost.localdomain ([94.229.40.98]) by smtp.gmail.com with ESMTPSA id x6sm4001376wjk.26.2016.08.11.12.04.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Aug 2016 12:04:02 -0700 (PDT) From: Andrej Krutak To: alsa-devel@alsa-project.org Date: Thu, 11 Aug 2016 21:02:20 +0200 Message-Id: <1470942147-19848-9-git-send-email-dev@andree.sk> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470942147-19848-1-git-send-email-dev@andree.sk> References: <1470942147-19848-1-git-send-email-dev@andree.sk> Cc: Andrej Krutak Subject: [alsa-devel] [PATCH 08/15] 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 f72803a..80ed138 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -341,17 +341,14 @@ static int podhd_init(struct usb_line6 *line6, line6->disconnect = podhd_disconnect; - /* 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 */