From 0b10479b41b21bba5f0a9b4cd01b8b6e719abce5 Mon Sep 17 00:00:00 2001
From: Jan Blunck <jblunck@suse.de>
Date: Tue, 27 Apr 2010 18:48:52 -0700
Subject: [PATCH] --- yaml --- r: 192130 b: refs/heads/master c:
 be94bbb5db4de0f3a2a5405511ea3ebea261f2c8 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/sbus/char/flash.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index da9cf8840a55..dd9eff7e58bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 667f0cee3e0321151aa7a1a5222afe67ca4be0ea
+refs/heads/master: be94bbb5db4de0f3a2a5405511ea3ebea261f2c8
diff --git a/trunk/drivers/sbus/char/flash.c b/trunk/drivers/sbus/char/flash.c
index 19f255b97c86..d3b62eb0fba7 100644
--- a/trunk/drivers/sbus/char/flash.c
+++ b/trunk/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;
 }