diff options
| author | Harry Butterworth <heb1001@gmail.com> | 2011-06-11 12:02:06 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-14 09:32:29 +0400 |
| commit | 55309216baeb9d7f951520cf8e8bf2337cd17bad (patch) | |
| tree | 8ccf7617bbf7bcd2866331e7aa5ccbac69b3fedf /sound/pci/ctxfi/xfi.c | |
| parent | 37f7ec38ea5c31180461f82e895e13fdd549b595 (diff) | |
| download | linux-55309216baeb9d7f951520cf8e8bf2337cd17bad.tar.xz | |
ALSA: ctxfi: Add support for Creative Titanium HD
Initialise model-specific DAC and ADC parts.
Add controls for output and mic source selection.
Rename some mixer controls according to ControlNames.txt.
Remove Playback switches for Line-in and IEC958-in - these
were controlling the input mute/unmute which affected
capture too. Use the capture switches to control the
input mute/unmute instead - it's less confusing.
Initialise the WM8775 to invert the left-right clock
to swap the left and right channels of the mic and aux
input.
Signed-off-by: Harry Butterworth <heb1001@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/xfi.c')
| -rw-r--r-- | sound/pci/ctxfi/xfi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c index f42e7e1a1074..7afa765afa3c 100644 --- a/sound/pci/ctxfi/xfi.c +++ b/sound/pci/ctxfi/xfi.c @@ -80,11 +80,11 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) "are 48000 and 44100, Value 48000 is assumed.\n"); reference_rate = 48000; } - if ((multiple != 1) && (multiple != 2)) { + if ((multiple != 1) && (multiple != 2) && (multiple != 4)) { printk(KERN_ERR "ctxfi: Invalid multiple value %u!!!\n", multiple); printk(KERN_ERR "ctxfi: The valid values for multiple are " - "1 and 2, Value 2 is assumed.\n"); + "1, 2 and 4, Value 2 is assumed.\n"); multiple = 2; } err = ct_atc_create(card, pci, reference_rate, multiple, |