diff options
| author |   Markus Bollinger <bollinger@digigram.com> | 2009-01-23 14:45:41 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2009-01-23 14:45:41 +0100 |
| commit | 55aef4508598d59c2baea7e2a3e6dfed415bbfc0 (patch) | |
| tree | 933e5b7029b9471bab5c260b58f2293812e9d77c /sound/pci/pcxhr/pcxhr_mixer.c | |
| parent | Linux 2.6.29-rc2 (diff) | |
| download | linux-dev-55aef4508598d59c2baea7e2a3e6dfed415bbfc0.tar.xz linux-dev-55aef4508598d59c2baea7e2a3e6dfed415bbfc0.zip | |
ALSA: pcxhr - add support for gpio ports and minor bug fix
- add support for gpio ports (2 GPI, 2 GPO) of pcxhr stereo cards
- minor bugfixes : allow setting clock to internal by the mixer
even if there is no stream (but monitoring)
Signed-off-by: Markus Bollinger <bollinger@digigram.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/pcxhr/pcxhr_mixer.c')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr_mixer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/pcxhr/pcxhr_mixer.c b/sound/pci/pcxhr/pcxhr_mixer.c index 2436e374586f..fec049344621 100644 --- a/sound/pci/pcxhr/pcxhr_mixer.c +++ b/sound/pci/pcxhr/pcxhr_mixer.c @@ -789,11 +789,15 @@ static int pcxhr_clock_type_put(struct snd_kcontrol *kcontrol, if (mgr->use_clock_type != ucontrol->value.enumerated.item[0]) { mutex_lock(&mgr->setup_mutex); mgr->use_clock_type = ucontrol->value.enumerated.item[0]; - if (mgr->use_clock_type) + rate = 0; + if (mgr->use_clock_type != PCXHR_CLOCK_TYPE_INTERNAL) { pcxhr_get_external_clock(mgr, mgr->use_clock_type, &rate); - else + } else { rate = mgr->sample_rate; + if (!rate) + rate = 48000; + } if (rate) { pcxhr_set_clock(mgr, rate); if (mgr->sample_rate) |