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

Commit 927aa577 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: Cleanup of compress offload drivers"

parents b9057d51 6b05cbea

sound/core/compress_offload.c

+5 −5
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ static int snd_compr_write_data(struct snd_compr_stream *stream, 
		      (app_pointer * runtime->buffer_size);



	dstn = runtime->buffer + app_pointer;

	pr_debug("copying %ld at %lld\n",

			(unsigned long)count, app_pointer);

	pr_debug("copying %zu at %lld\n",

			count, app_pointer);

	if (count < runtime->buffer_size - app_pointer) {

		if (copy_from_user(dstn, buf, count))

			return -EFAULT;
@@ -315,7 +315,7 @@ static ssize_t snd_compr_write(struct file *f, const char __user *buf, 
	}



	avail = snd_compr_get_avail(stream);

	pr_debug("avail returned %ld\n", (unsigned long)avail);

	pr_debug("avail returned %zu\n", avail);

	/* calculate how much we can write to buffer */

	if (avail > count)

		avail = count;
@@ -372,7 +372,7 @@ static ssize_t snd_compr_read(struct file *f, char __user *buf, 
	}



	avail = snd_compr_get_avail(stream);

	pr_debug("avail returned %ld\n", (unsigned long)avail);

	pr_debug("avail returned %zu\n", avail);

	/* calculate how much we can read from buffer */

	if (avail > count)

		avail = count;
@@ -430,7 +430,7 @@ static __poll_t snd_compr_poll(struct file *f, poll_table *wait) 
	poll_wait(f, &stream->runtime->sleep, wait);



	avail = snd_compr_get_avail(stream);

	pr_debug("avail is %ld\n", (unsigned long)avail);

	pr_debug("avail is %zu\n", avail);

	/* check if we have at least one fragment to fill */

	switch (stream->runtime->state) {

	case SNDRV_PCM_STATE_DRAINING: