mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
cris: use simple_read_from_buffer()
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d50004b086
commit
ed62f77bb6
1 changed files with 7 additions and 10 deletions
|
@ -35,19 +35,16 @@ read_cris_profile(struct file *file, char __user *buf,
|
||||||
size_t count, loff_t *ppos)
|
size_t count, loff_t *ppos)
|
||||||
{
|
{
|
||||||
unsigned long p = *ppos;
|
unsigned long p = *ppos;
|
||||||
|
ssize_t ret;
|
||||||
|
|
||||||
if (p > SAMPLE_BUFFER_SIZE)
|
ret = simple_read_from_buffer(buf, count, ppos, sample_buffer,
|
||||||
return 0;
|
SAMPLE_BUFFER_SIZE);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
if (p + count > SAMPLE_BUFFER_SIZE)
|
memset(sample_buffer + p, 0, ret);
|
||||||
count = SAMPLE_BUFFER_SIZE - p;
|
|
||||||
if (copy_to_user(buf, sample_buffer + p,count))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
memset(sample_buffer + p, 0, count);
|
return ret;
|
||||||
*ppos += count;
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t
|
static ssize_t
|
||||||
|
|
Loading…
Reference in a new issue