From: Mark Hills <mark@pogo.org.uk>
Date: Sat, 29 May 2010 15:53:25 +0000 (+0100)
Subject: ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
X-Git-Tag: v2.6.35-rc1~17^2~1^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=649233562cb1e83ebd2af30bd981881e51961b8b;p=karo-tx-linux.git

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>
---

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 +