From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrej Krutak Subject: [PATCH v4 10/12] ALSA: line6: Only determine control port properties if needed Date: Sun, 18 Sep 2016 20:59:30 +0200 Message-ID: <1474225172-32081-11-git-send-email-dev@andree.sk> References: <1470942147-19848-1-git-send-email-dev@andree.sk> <1474225172-32081-1-git-send-email-dev@andree.sk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by alsa0.perex.cz (Postfix) with ESMTP id CF0DE26155B for ; Sun, 18 Sep 2016 21:00:57 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id l132so10516354wmf.1 for ; Sun, 18 Sep 2016 12:00:57 -0700 (PDT) In-Reply-To: <1474225172-32081-1-git-send-email-dev@andree.sk> 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 To: tiwai@suse.com, perex@perex.cz, stefanha@gmail.com, grabner@icg.tugraz.at, alsa-devel@alsa-project.org Cc: Andrej Krutak List-Id: alsa-devel@alsa-project.org Not all line6 devices use the control port. Signed-off-by: Andrej Krutak --- sound/usb/line6/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 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; -- 1.9.1