evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media: dvb-core: Fix for dvb_ringbuffer merge conflict

Browse source 
resolve the dvb_ringbuffer merge conflicts due to
v4.4-16.09-android-tmp branch merging.

CRs-Fixed: 1086706
Change-Id: Ic5ec87d48e86fd9504fed7232286cf81b46c4035
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
This commit is contained in:
Udaya Bhaskara Reddy Mallavarapu 2017-01-05 10:49:50 +05:30
parent 8bb66a7e41
commit 15d83b644a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/dvb-core/dvb_ringbuffer.c
View file

@ -233,9 +233,11 @@ ssize_t dvb_ringbuffer_write_user(struct dvb_ringbuffer *rbuf,
*/ */
smp_store_release(&rbuf->pwrite, 0); smp_store_release(&rbuf->pwrite, 0);
} }
status = copy_from_user(rbuf->data+rbuf->pwrite, buf, todo);
if (status) if (copy_from_user(rbuf->data + rbuf->pwrite, buf, todo)) {
return len - todo; smp_store_release(&rbuf->pwrite, oldpwrite);
return -EFAULT;
}
/* smp_store_release() for write pointer update, see above */ /* smp_store_release() for write pointer update, see above */
smp_store_release(&rbuf->pwrite, (rbuf->pwrite + todo) % rbuf->size); smp_store_release(&rbuf->pwrite, (rbuf->pwrite + todo) % rbuf->size);