Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 889f8edb authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: compress: propagate the error code from the compress framework" into msm-4.8

parents e5db1909 1ad212c1

sound/core/compress_offload.c

+4 −1
Original line number Diff line number Diff line
@@ -180,9 +180,12 @@ static int snd_compr_free(struct inode *inode, struct file *f) 
static int snd_compr_update_tstamp(struct snd_compr_stream *stream,

		struct snd_compr_tstamp *tstamp)

{

	int err = 0;

	if (!stream->ops->pointer)

		return -ENOTSUPP;

	stream->ops->pointer(stream, tstamp);

	err = stream->ops->pointer(stream, tstamp);

	if (err)

		return err;

	pr_debug("dsp consumed till %d total %d bytes\n",

		tstamp->byte_offset, tstamp->copied_total);

	if (stream->direction == SND_COMPRESS_PLAYBACK)