projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4efd7d8
)
ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
author
Mark Hills
<
[email protected]
>
Sat, 29 May 2010 15:53:25 +0000
(16:53 +0100)
committer
Takashi Iwai
<
[email protected]
>
Sat, 29 May 2010 19:49:00 +0000
(21:49 +0200)
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 <
[email protected]
>
Signed-off-by: Mark Hills <
[email protected]
>
Signed-off-by: Takashi Iwai <
[email protected]
>
sound/usb/caiaq/device.c
patch
|
blob
|
history
diff --git
a/sound/usb/caiaq/device.c
b/sound/usb/caiaq/device.c
index 805271827675a32c3420b2313008e8c09ed10237..bf71048e32479ef72f12d976f5d6f7a01e5c6aa0 100644
(file)
--- 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 +