projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict
[linux-2.6-microblaze.git]
/
sound
/
soc
/
amd
/
acp-pcm-dma.c
diff --git
a/sound/soc/amd/acp-pcm-dma.c
b/sound/soc/amd/acp-pcm-dma.c
index
77b265b
..
c7e972b
100644
(file)
--- a/
sound/soc/amd/acp-pcm-dma.c
+++ b/
sound/soc/amd/acp-pcm-dma.c
@@
-867,8
+867,12
@@
static int acp_dma_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
if (pinfo) {
return -EINVAL;
if (pinfo) {
- rtd->i2s_instance = pinfo->i2s_instance;
- rtd->capture_channel = pinfo->capture_channel;
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ rtd->i2s_instance = pinfo->play_i2s_instance;
+ } else {
+ rtd->i2s_instance = pinfo->cap_i2s_instance;
+ rtd->capture_channel = pinfo->capture_channel;
+ }
}
if (adata->asic_type == CHIP_STONEY) {
val = acp_reg_read(adata->acp_mmio,
}
if (adata->asic_type == CHIP_STONEY) {
val = acp_reg_read(adata->acp_mmio,