summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Hills <mark@pogo.org.uk>2010-05-29 16:53:25 +0100
committerTakashi Iwai <tiwai@suse.de>2010-05-29 21:49:00 +0200
commit649233562cb1e83ebd2af30bd981881e51961b8b (patch)
tree8a5b91231331e2a0c2a899a5533478bd296334f2 /sound
parent4efd7d8f67ac5ff80db06b77c46aca6e0d9f878b (diff)
downloadlinux-649233562cb1e83ebd2af30bd981881e51961b8b.tar.gz
linux-649233562cb1e83ebd2af30bd981881e51961b8b.tar.bz2
linux-649233562cb1e83ebd2af30bd981881e51961b8b.zip
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 <daniel@caiaq.de> Signed-off-by: Mark Hills <mark@pogo.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/caiaq/device.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 805271827675..bf71048e3247 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 +