Skip to content

Commit

Permalink
Revert "ALSA: line6: Only determine control port properties if needed"
Browse files Browse the repository at this point in the history
This reverts commit f6a0dd1.

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: f6a0dd1 ("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>
  • Loading branch information
Takashi Iwai committed Feb 7, 2017
1 parent 37a7ea4 commit f3d8331
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sound/usb/line6/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f3d8331

Please sign in to comment.