projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46b50e5
)
ASoC: amd: ps: fix byte count return value for invalid SoundWire manager instance
author
Vijendar Mukunda
<Vijendar.Mukunda@amd.com>
Mon, 26 Jun 2023 10:53:53 +0000
(16:23 +0530)
committer
Mark Brown
<broonie@kernel.org>
Mon, 26 Jun 2023 12:29:00 +0000
(13:29 +0100)
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>
sound/soc/amd/ps/ps-sdw-dma.c
patch
|
blob
|
history
diff --git
a/sound/soc/amd/ps/ps-sdw-dma.c
b/sound/soc/amd/ps/ps-sdw-dma.c
index
000ab5d
..
324c80f
100644
(file)
--- 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;
}