Commit be94bbb5 authored by Jan Blunck's avatar Jan Blunck Committed by David S. Miller

drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos

flash_read() updates file->f_pos directly instead of the ppos given.  The
VFS later updates the file->f_pos and overwrites it with the unchanged
value of ppos.
Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 667f0cee
...@@ -105,9 +105,9 @@ static ssize_t ...@@ -105,9 +105,9 @@ static ssize_t
flash_read(struct file * file, char __user * buf, flash_read(struct file * file, char __user * buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
unsigned long p = file->f_pos; loff_t p = *ppos;
int i; int i;
if (count > flash.read_size - p) if (count > flash.read_size - p)
count = flash.read_size - p; count = flash.read_size - p;
...@@ -118,7 +118,7 @@ flash_read(struct file * file, char __user * buf, ...@@ -118,7 +118,7 @@ flash_read(struct file * file, char __user * buf,
buf++; buf++;
} }
file->f_pos += count; *ppos += count;
return count; return count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment