summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorErik J. Staab <ejs@insightbb.com>2010-09-22 11:07:41 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-22 10:04:08 +0200
commit0873a5ae747847ee55a63db409dff3476e45bcd9 (patch)
treef2ce79f043f6249b3c702c82f1fe0a1d585a8ce0 /sound
parentb30a3f6257ed2105259b404d419b4964e363928c (diff)
downloadlinux-0873a5ae747847ee55a63db409dff3476e45bcd9.tar.gz
linux-0873a5ae747847ee55a63db409dff3476e45bcd9.tar.bz2
linux-0873a5ae747847ee55a63db409dff3476e45bcd9.zip
ALSA: oxygen: fix analog capture on Claro halo cards
On the HT-Omega Claro halo card, the ADC data must be captured from the second I2S input. Using the default first input, which isn't connected to anything, would result in silence. Signed-off-by: Erik J. Staab <ejs@insightbb.com> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/oxygen/oxygen.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 289cb4dacfc7..6c0a11adb2a8 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -543,6 +543,10 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
chip->model.suspend = claro_suspend;
chip->model.resume = claro_resume;
chip->model.set_adc_params = set_ak5385_params;
+ chip->model.device_config = PLAYBACK_0_TO_I2S |
+ PLAYBACK_1_TO_SPDIF |
+ CAPTURE_0_FROM_I2S_2 |
+ CAPTURE_1_FROM_SPDIF;
break;
}
if (id->driver_data == MODEL_MERIDIAN ||