diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-29 21:50:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-29 21:50:33 +0200 |
| commit | a98d3984c85222aa9efc63c4f9dd3d805ce469f2 (patch) | |
| tree | aeb9ebdcc06ca92b8114f30cedf16b8f3780b3f2 /sound/usb/caiaq/device.c | |
| parent | 52593de4c11fb24c83d8036ba34706881aab5e3d (diff) | |
| parent | 55567ab70bd8551c73253e44ea5244db41eac81b (diff) | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/usb/caiaq/device.c')
| -rw-r--r-- | sound/usb/caiaq/device.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index 80527182767..cdfb856bddd 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -36,7 +36,7 @@ #include "input.h" MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); -MODULE_DESCRIPTION("caiaq USB audio, version 1.3.20"); +MODULE_DESCRIPTION("caiaq USB audio, version 1.3.21"); MODULE_LICENSE("GPL"); MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," "{Native Instruments, RigKontrol3}," @@ -320,12 +320,6 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) } break; - case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ): - /* Audio 4 DJ - default input mode to phono */ - dev->control_state[0] = 2; - snd_usb_caiaq_send_command(dev, EP1_CMD_WRITE_IO, - dev->control_state, 1); - break; } if (dev->spec.num_analog_audio_out + |