aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Krutak <dev@andree.sk>2016-09-18 14:59:30 -0400
committerTakashi Iwai <tiwai@suse.de>2016-09-19 17:02:29 -0400
commitf6a0dd107ad0c8b59d1c9735eea4b8cb9f460949 (patch)
tree21073dca89d1790ad27afc025eb063d2b0b11646
parentc039aaa77a7d1d9375665a8b59ec16dc7d23e259 (diff)
ALSA: line6: Only determine control port properties if needed
Not all line6 devices use the control port. Signed-off-by: Andrej Krutak <dev@andree.sk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/line6/driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 853a14365453..8a71d45ce945 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -612,9 +612,8 @@ int line6_probe(struct usb_interface *interface,
612 goto error; 612 goto error;
613 } 613 }
614 614
615 line6_get_interval(line6);
616
617 if (properties->capabilities & LINE6_CAP_CONTROL) { 615 if (properties->capabilities & LINE6_CAP_CONTROL) {
616 line6_get_interval(line6);
618 ret = line6_init_cap_control(line6); 617 ret = line6_init_cap_control(line6);
619 if (ret < 0) 618 if (ret < 0)
620 goto error; 619 goto error;