Merge "media: dvb-core: Fix for dvb_ringbuffer merge conflict" (96f3cc94) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/dvb-core/dvb_ringbuffer.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -233,9 +233,11 @@ ssize_t dvb_ringbuffer_write_user(struct dvb_ringbuffer *rbuf,
		*/
		smp_store_release(&rbuf->pwrite, 0);
		}
		status = copy_from_user(rbuf->data+rbuf->pwrite, buf, todo);
		if (status)
		return len - todo;

		if (copy_from_user(rbuf->data + rbuf->pwrite, buf, todo)) {
		smp_store_release(&rbuf->pwrite, oldpwrite);
		return -EFAULT;
		}
		/* smp_store_release() for write pointer update, see above */
		smp_store_release(&rbuf->pwrite, (rbuf->pwrite + todo) % rbuf->size);