summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorAndrej Krutak <dev@andree.sk>2016-09-18 20:59:30 +0200
committerTakashi Iwai <tiwai@suse.de>2016-09-19 23:02:29 +0200
commitf6a0dd107ad0c8b59d1c9735eea4b8cb9f460949 (patch)
tree21073dca89d1790ad27afc025eb063d2b0b11646 /sound/usb
parentc039aaa77a7d1d9375665a8b59ec16dc7d23e259 (diff)
downloadlinux-f6a0dd107ad0c8b59d1c9735eea4b8cb9f460949.tar.gz
linux-f6a0dd107ad0c8b59d1c9735eea4b8cb9f460949.tar.bz2
linux-f6a0dd107ad0c8b59d1c9735eea4b8cb9f460949.zip
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>
Diffstat (limited to 'sound/usb')
-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,
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;