diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-30 12:15:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-30 12:15:55 +0100 |
| commit | 6eb3db91f2b68cbbcc1b4256333dc683afb54a73 (patch) | |
| tree | 0b8fec47c5f66b1bd54e7e15de618698d69123af /sound/usb/line6/variax.c | |
| parent | d832f3dcb6e2d153fbb69b91931058d138bc41cb (diff) | |
| parent | 1263f61179821df60cca4bccdb69e2f71fdebaa7 (diff) | |
| download | op-kernel-dev-6eb3db91f2b68cbbcc1b4256333dc683afb54a73.zip op-kernel-dev-6eb3db91f2b68cbbcc1b4256333dc683afb54a73.tar.gz | |
Merge branch 'topic/line6' into for-next
Diffstat (limited to 'sound/usb/line6/variax.c')
| -rw-r--r-- | sound/usb/line6/variax.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/sound/usb/line6/variax.c b/sound/usb/line6/variax.c index 9701ffa..b1c1de6 100644 --- a/sound/usb/line6/variax.c +++ b/sound/usb/line6/variax.c @@ -17,7 +17,6 @@ #include <sound/core.h> #include "driver.h" -#include "usbdefs.h" #define VARIAX_STARTUP_DELAY1 1000 #define VARIAX_STARTUP_DELAY3 100 @@ -42,30 +41,20 @@ enum { }; struct usb_line6_variax { - /** - Generic Line 6 USB data. - */ + /* Generic Line 6 USB data */ struct usb_line6 line6; - /** - Buffer for activation code. - */ + /* Buffer for activation code */ unsigned char *buffer_activate; - /** - Handler for device initializaton. - */ + /* Handler for device initialization */ struct work_struct startup_work; - /** - Timers for device initializaton. - */ + /* Timers for device initialization */ struct timer_list startup_timer1; struct timer_list startup_timer2; - /** - Current progress in startup procedure. - */ + /* Current progress in startup procedure */ int startup_progress; }; @@ -270,9 +259,7 @@ static const struct line6_properties variax_properties_table[] = { [LINE6_PODXTLIVE_VARIAX] = { .id = "PODxtLive", .name = "PODxt Live", - .capabilities = LINE6_CAP_CONTROL - | LINE6_CAP_PCM - | LINE6_CAP_HWMON, + .capabilities = LINE6_CAP_CONTROL, .altsetting = 1, .ep_ctrl_r = 0x86, .ep_ctrl_w = 0x05, |
