summaryrefslogtreecommitdiffstats
path: root/sound/soc/amd/ps/ps-sdw-dma.c
diff options
context:
space:
mode:
authorVijendar Mukunda <Vijendar.Mukunda@amd.com>2023-06-26 12:53:53 +0200
committerMark Brown <broonie@kernel.org>2023-06-26 14:29:00 +0200
commit68a653ab864ccf7874fe622f3af20fe7345c39be (patch)
treefbe881b3a9b95cdeccfa03042be36230e8419093 /sound/soc/amd/ps/ps-sdw-dma.c
parentASoC: amd: ps: add comments for DMA register mapping (diff)
downloadlinux-68a653ab864ccf7874fe622f3af20fe7345c39be.tar.xz
linux-68a653ab864ccf7874fe622f3af20fe7345c39be.zip
ASoC: amd: ps: fix byte count return value for invalid SoundWire manager instance
acp_get_byte_count() function should return zero bytes instead of -EINVAL for invalid SoundWire manager instance. Fixes: f722917350ee ("ASoC: amd: ps: add SoundWire dma driver dma ops") Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Link: https://lore.kernel.org/r/20230626105356.2580125-5-Vijendar.Mukunda@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/amd/ps/ps-sdw-dma.c')
-rw-r--r--sound/soc/amd/ps/ps-sdw-dma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/amd/ps/ps-sdw-dma.c b/sound/soc/amd/ps/ps-sdw-dma.c
index 000ab5d96815..324c80fca672 100644
--- a/sound/soc/amd/ps/ps-sdw-dma.c
+++ b/sound/soc/amd/ps/ps-sdw-dma.c
@@ -318,12 +318,13 @@ static u64 acp63_sdw_get_byte_count(struct acp_sdw_dma_stream *stream, void __io
pos_high_reg = sdw1_dma_ring_buf_reg[stream->stream_id].pos_high_reg;
break;
default:
- return -EINVAL;
+ goto POINTER_RETURN_BYTES;
}
if (pos_low_reg) {
byte_count.bcount.high = readl(acp_base + pos_high_reg);
byte_count.bcount.low = readl(acp_base + pos_low_reg);
}
+POINTER_RETURN_BYTES:
return byte_count.bytescount;
}