Commit f3d83317 authored Feb 07, 2017 by Takashi Iwai

Revert "ALSA: line6: Only determine control port properties if needed"



This reverts commit f6a0dd10.

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: f6a0dd10 ("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>

parent 37a7ea4a

sound/usb/line6/driver.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -754,8 +754,9 @@ int line6_probe(struct usb_interface *interface,
		goto error;
		}

		if (properties->capabilities & LINE6_CAP_CONTROL) {
		line6_get_interval(line6);

		if (properties->capabilities & LINE6_CAP_CONTROL) {
		ret = line6_init_cap_control(line6);
		if (ret < 0)
		goto error;