summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-02-07 11:32:30 +0300
committerTakashi Iwai <tiwai@suse.de>2017-02-07 11:37:11 +0300
commitf3d83317a69e7d658e7c83e24f8b31ac533c39e3 (patch)
tree96d5ec1c3522cd41ff5193f3a8e89ab18941c87b
parent37a7ea4a9b81f6a864c10a7cb0b96458df5310a3 (diff)
downloadlinux-f3d83317a69e7d658e7c83e24f8b31ac533c39e3.tar.xz
Revert "ALSA: line6: Only determine control port properties if needed"
This reverts commit f6a0dd107ad0c8b59d1c9735eea4b8cb9f460949. The commit caused a regression on LINE6 Transport that has no control caps. Although reverting the commit may result back in a spurious error message for some device again, it's the simplest regression fix, hence it's taken as is at first. The further code fix will follow later. Fixes: f6a0dd107ad0 ("ALSA: line6: Only determine control port properties if needed") Reported-by: Igor Zinovev <zinigor@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-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;