summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-02-07 09:38:44 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-07 09:38:44 +0100
commit1e94320ffee29424ef70cdbb7f5601216382b7e6 (patch)
tree5558a860abefef6d348cd586cb3aa177de0d1476 /sound/usb
parente1b239f371c0c745542cb8108d085ec728e8a69c (diff)
parentf3d83317a69e7d658e7c83e24f8b31ac533c39e3 (diff)
downloadlinux-stable-1e94320ffee29424ef70cdbb7f5601216382b7e6.tar.gz
linux-stable-1e94320ffee29424ef70cdbb7f5601216382b7e6.tar.bz2
linux-stable-1e94320ffee29424ef70cdbb7f5601216382b7e6.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/line6/driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 90009c0b3a92..ab3c280a23d1 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -754,8 +754,9 @@ 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;