| From f3d83317a69e7d658e7c83e24f8b31ac533c39e3 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Tue, 7 Feb 2017 09:32:30 +0100 |
| Subject: Revert "ALSA: line6: Only determine control port properties if needed" |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| commit f3d83317a69e7d658e7c83e24f8b31ac533c39e3 upstream. |
| |
| 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> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/usb/line6/driver.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/sound/usb/line6/driver.c |
| +++ b/sound/usb/line6/driver.c |
| @@ -754,8 +754,9 @@ int line6_probe(struct usb_interface *in |
| 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; |
