aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Hills <mark@pogo.org.uk>2009-02-04 22:34:31 +0000
committerTakashi Iwai <tiwai@suse.de>2009-02-05 09:32:39 +0100
commite3ca4c9982e3b84da859ca20a3ca0a9d5bda8c30 (patch)
tree69763275157d371e72fc536acec80d645cec20fc /sound
parent705350f8bd6b44fda3f0dcc3e6f4b453da4378dd (diff)
downloadkernel_samsung_smdk4412-e3ca4c9982e3b84da859ca20a3ca0a9d5bda8c30.zip
kernel_samsung_smdk4412-e3ca4c9982e3b84da859ca20a3ca0a9d5bda8c30.tar.gz
kernel_samsung_smdk4412-e3ca4c9982e3b84da859ca20a3ca0a9d5bda8c30.tar.bz2
ALSA: snd-usb-caiaq: Set default input mode of A4DJ
Do not start the device with input mode undefined. Mimic the behaviour of the Audio 8 DJ and start in phono input mode. Signed-off-by: Mark Hills <mark@pogo.org.uk> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/caiaq/caiaq-device.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index d09fc2a..94610dd 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -312,6 +312,12 @@ 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 +