diff --git a/[refs] b/[refs] index 0d3f2943bff8..6c6f78fbe5b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b98f9334e25c463fbfbb1cc468c66845e1c8e46a +refs/heads/master: feb77712b0e780f04507cdda0529088ff0f3286f diff --git a/trunk/sound/pci/cmipci.c b/trunk/sound/pci/cmipci.c index 3a2d942f22bb..d1f23ebed2ae 100644 --- a/trunk/sound/pci/cmipci.c +++ b/trunk/sound/pci/cmipci.c @@ -869,6 +869,13 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec, snd_cmipci_write(cm, CM_REG_CHFORMAT, val); //snd_printd("cmipci: chformat = %08x\n", val); + if (!rec->is_dac && cm->chip_version) { + if (runtime->rate > 44100) + snd_cmipci_set_bit(cm, CM_REG_EXT_MISC, CM_ADC48K44K); + else + snd_cmipci_clear_bit(cm, CM_REG_EXT_MISC, CM_ADC48K44K); + } + rec->running = 0; spin_unlock_irq(&cm->reg_lock);