From: Mark Hills <mark@pogo.org.uk>
Date: Sat, 29 May 2010 15:53:23 +0000 (+0100)
Subject: ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ
X-Git-Tag: v2.6.35-rc1~17^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd4cbf6c7689d35d5d1248369d2c350f4711ca0a;p=pandora-kernel.git

ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ

This feature was undocumented on early A4DJ units. It is indicated
by lighting both the 'line' and 'phono' lamps at the same time.
Newer units document this and the newer Windows drivers enable this
for all units, so restore the functionality.

This patch simplifies the code and changes the mode mapping to match
the A8DJ, favouring simpler code and consistency over keeping the
existing mapping.

Both 'Control vinyl' and 'Phono' input modes enable the hardware
preamp. The difference is the input impedance.

This reverts commit 9a9527e.

Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Mark Hills <mark@pogo.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

Reading git-diff-tree failed