From c2ba9aa39196932e8fa1c247b9f61f162b29cfe4 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Thu, 24 Jan 2008 16:45:57 +0200
Subject: [PATCH] --- yaml --- r: 84293 b: refs/heads/master c:
 0411e7353192d7deebd4f50b9ee41974ec3a634c h: refs/heads/master i:   84291:
 04bea4636df6a2ab8843122eb1362147659c85dd v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mtd/ubi/cdev.c | 4 +---
 trunk/drivers/mtd/ubi/upd.c  | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c8510f43c9be..655e957bd733 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91f2d53cd75a8fa3557246af965155208c4c69a7
+refs/heads/master: 0411e7353192d7deebd4f50b9ee41974ec3a634c
diff --git a/trunk/drivers/mtd/ubi/cdev.c b/trunk/drivers/mtd/ubi/cdev.c
index a7aa123afaf6..d9bd49421cce 100644
--- a/trunk/drivers/mtd/ubi/cdev.c
+++ b/trunk/drivers/mtd/ubi/cdev.c
@@ -368,6 +368,7 @@ static ssize_t vol_cdev_write(struct file *file, const char __user *buf,
 		 */
 		count = err;
 
+		vol->updating = 0;
 		err = ubi_check_volume(ubi, vol->vol_id);
 		if (err < 0)
 			return err;
@@ -382,7 +383,6 @@ static ssize_t vol_cdev_write(struct file *file, const char __user *buf,
 		revoke_exclusive(desc, UBI_READWRITE);
 	}
 
-	*offp += count;
 	return count;
 }
 
@@ -430,8 +430,6 @@ static int vol_cdev_ioctl(struct inode *inode, struct file *file,
 		err = ubi_start_update(ubi, vol->vol_id, bytes);
 		if (bytes == 0)
 			revoke_exclusive(desc, UBI_READWRITE);
-
-		file->f_pos = 0;
 		break;
 	}
 
diff --git a/trunk/drivers/mtd/ubi/upd.c b/trunk/drivers/mtd/ubi/upd.c
index e32b04d2e048..3defa579fab0 100644
--- a/trunk/drivers/mtd/ubi/upd.c
+++ b/trunk/drivers/mtd/ubi/upd.c
@@ -343,7 +343,6 @@ int ubi_more_update_data(struct ubi_device *ubi, int vol_id,
 		if (err == 0) {
 			err = to_write;
 			vfree(vol->upd_buf);
-			vol->updating = 0;
 		}
 	}