drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos
authorJan Blunck <jblunck@suse.de>
Wed, 28 Apr 2010 01:48:52 +0000 (18:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Apr 2010 01:48:52 +0000 (18:48 -0700)
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>
drivers/sbus/char/flash.c

index 19f255b..d3b62eb 100644 (file)
@@ -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;
 }