Skip to content

Commit

Permalink
Revert "ANDROID: GKI: ASoC: msm: fix integer overflow for long duration
Browse files Browse the repository at this point in the history
offload playback"

This reverts commit dbad92f.

Change in UAPI structure broke a compatibility with userspace
applications.

Change-Id: Iab3330b2ce249e04e21dab89889e80cea7ed56c0
Signed-off-by: Piotr Maziarz <piotrx.maziarz@linux.intel.com>
Tracked-On: PKT-4407, OAM-96114
  • Loading branch information
Piotr Maziarz authored and yifanli-intel committed Feb 23, 2021
1 parent c352ceb commit f5400e4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/uapi/sound/compress_offload.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct snd_compr_params {
*/
struct snd_compr_tstamp {
__u32 byte_offset;
__u64 copied_total;
__u32 copied_total;
__u32 pcm_frames;
__u32 pcm_io_frames;
__u32 sampling_rate;
Expand Down
2 changes: 1 addition & 1 deletion sound/core/compress_offload.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static int snd_compr_update_tstamp(struct snd_compr_stream *stream,
if (!stream->ops->pointer)
return -ENOTSUPP;
stream->ops->pointer(stream, tstamp);
pr_debug("dsp consumed till %d total %llu bytes\n",
pr_debug("dsp consumed till %d total %d bytes\n",
tstamp->byte_offset, tstamp->copied_total);
if (stream->direction == SND_COMPRESS_PLAYBACK)
stream->runtime->total_bytes_transferred = tstamp->copied_total;
Expand Down

0 comments on commit f5400e4

Please sign in to comment.