Skip to content

Commit

Permalink
cris: use simple_read_from_buffer()
Browse files Browse the repository at this point in the history
Signed-off-by: Akinobu Mita <[email protected]>
Cc: Mikael Starvik <[email protected]>
Cc: Jesper Nilsson <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
mita authored and torvalds committed Jul 24, 2008
1 parent d50004b commit ed62f77
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions arch/cris/kernel/profile.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,16 @@ read_cris_profile(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
unsigned long p = *ppos;
ssize_t ret;

if (p > SAMPLE_BUFFER_SIZE)
return 0;
ret = simple_read_from_buffer(buf, count, ppos, sample_buffer,
SAMPLE_BUFFER_SIZE);
if (ret < 0)
return ret;

if (p + count > SAMPLE_BUFFER_SIZE)
count = SAMPLE_BUFFER_SIZE - p;
if (copy_to_user(buf, sample_buffer + p,count))
return -EFAULT;
memset(sample_buffer + p, 0, ret);

memset(sample_buffer + p, 0, count);
*ppos += count;

return count;
return ret;
}

static ssize_t
Expand Down

0 comments on commit ed62f77

Please sign in to comment.