mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'fix/misc' into topic/misc
This commit is contained in:
commit
ef47bf386e
11 changed files with 64 additions and 21 deletions
|
|
@ -501,6 +501,10 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
int err;
|
||||
|
||||
aaci_pcm_hw_free(substream);
|
||||
if (aacirun->pcm_open) {
|
||||
snd_ac97_pcm_close(aacirun->pcm);
|
||||
aacirun->pcm_open = 0;
|
||||
}
|
||||
|
||||
err = devdma_hw_alloc(NULL, substream,
|
||||
params_buffer_bytes(params));
|
||||
|
|
@ -514,7 +518,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
else
|
||||
err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params),
|
||||
params_channels(params),
|
||||
aacirun->pcm->r[1].slots);
|
||||
aacirun->pcm->r[0].slots);
|
||||
|
||||
if (err)
|
||||
goto out;
|
||||
|
|
|
|||
Loading…
Reference in a new issue