aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAdrian Knoth <adi@drcomp.erfurt.thur.de>2012-05-30 14:23:18 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-31 10:26:12 +0200
commita97bda7d29d02a2e9c6609d0947b15e55f5200e5 (patch)
tree62fd74b55d53d2074bc1da1abe3d69b58d0ffee6 /sound
parent5cd5d7c44990658df6ab49f6253c39617c53b03d (diff)
downloadkernel_goldelico_gta04-a97bda7d29d02a2e9c6609d0947b15e55f5200e5.zip
kernel_goldelico_gta04-a97bda7d29d02a2e9c6609d0947b15e55f5200e5.tar.gz
kernel_goldelico_gta04-a97bda7d29d02a2e9c6609d0947b15e55f5200e5.tar.bz2
ALSA: hdspm - Work around broken DDS value on PCI RME MADI
On PCI RME MADI cards, the PLL register does not contain the proper value, so the calculated system_sample_rate is wrong. In this case, we simply return the cached rate from struct hdspm. Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/rme9652/hdspm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 0a5027b..b8ac871 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -1988,6 +1988,13 @@ static int hdspm_get_system_sample_rate(struct hdspm *hdspm)
period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
rate = hdspm_calc_dds_value(hdspm, period);
+ if (rate > 207000) {
+ /* Unreasonable high sample rate as seen on PCI MADI cards.
+ * Use the cached value instead.
+ */
+ rate = hdspm->system_sample_rate;
+ }
+
return rate;
}