diff options
| author | Jan Blunck <jblunck@suse.de> | 2010-04-27 18:48:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 18:48:52 -0700 |
| commit | be94bbb5db4de0f3a2a5405511ea3ebea261f2c8 (patch) | |
| tree | d00c309d4b9e80acf9e16ea398f2b7d410226325 /drivers | |
| parent | 667f0cee3e0321151aa7a1a5222afe67ca4be0ea (diff) | |
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: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sbus/char/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 19f255b97c8..d3b62eb0fba 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -105,9 +105,9 @@ static ssize_t flash_read(struct file * file, char __user * buf, size_t count, loff_t *ppos) { - unsigned long p = file->f_pos; + loff_t p = *ppos; int i; - + if (count > flash.read_size - p) count = flash.read_size - p; @@ -118,7 +118,7 @@ flash_read(struct file * file, char __user * buf, buf++; } - file->f_pos += count; + *ppos += count; return count; } |