From 649233562cb1e83ebd2af30bd981881e51961b8b Mon Sep 17 00:00:00 2001 From: Mark Hills Date: Sat, 29 May 2010 16:53:25 +0100 Subject: ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ" Do not explicity set the default input mode. Use the hardware default of mode 0 ('Control vinyl'), which is now available. This reverts commit e3ca4c9. Acked-by: Daniel Mack Signed-off-by: Mark Hills Signed-off-by: Takashi Iwai --- sound/usb/caiaq/device.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sound/usb/caiaq/device.c') diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index 80527182767..bf71048e324 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -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 + -- cgit v1.2.3-70-g09d2 From 55567ab70bd8551c73253e44ea5244db41eac81b Mon Sep 17 00:00:00 2001 From: Mark Hills Date: Sat, 29 May 2010 16:53:26 +0100 Subject: ALSA: snd-usb-caiaq: Bump version number to 1.3.21 Acked-by: Daniel Mack Signed-off-by: Mark Hills Signed-off-by: Takashi Iwai --- sound/usb/caiaq/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/usb/caiaq/device.c') diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index bf71048e324..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 "); -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}," -- cgit v1.2.3-70-g09d2