From 290f8d27b4769453f646f2b1b90d1fccae4c616a Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Wed, 19 Dec 2007 16:03:17 +0200
Subject: [PATCH] --- yaml --- r: 84239 b: refs/heads/master c:
 16f557ecbf96dd13d13788a6f62d4d97ae73b1f9 h: refs/heads/master i:   84237:
 1d4d47880de569f14538a527a4d9da79573f88dc   84235:
 3188139ad12831df1a553f83e5f2e89fa752cbe2   84231:
 11e52f5a9873e08b853a618bfc0e17162f98e9c7   84223:
 961049f3ba812e9be893e0dc291bb2ab7bc9cc70 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mtd/ubi/vtbl.c | 5 ++---
 trunk/drivers/mtd/ubi/wl.c   | 9 +++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 27003e2e16f0..4fd255d6233a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 593dd33c92c6529443d5df1350dc5cc76511232d
+refs/heads/master: 16f557ecbf96dd13d13788a6f62d4d97ae73b1f9
diff --git a/trunk/drivers/mtd/ubi/vtbl.c b/trunk/drivers/mtd/ubi/vtbl.c
index a37dc7a213b1..7a1a8a1da610 100644
--- a/trunk/drivers/mtd/ubi/vtbl.c
+++ b/trunk/drivers/mtd/ubi/vtbl.c
@@ -115,9 +115,8 @@ int ubi_change_vtbl_record(struct ubi_device *ubi, int idx,
 }
 
 /**
- * vol_til_check - check if volume table is not corrupted and contains sensible
- * data.
- *
+ * vtbl_check - check if volume table is not corrupted and contains sensible
+ *              data.
  * @ubi: UBI device description object
  * @vtbl: volume table
  *
diff --git a/trunk/drivers/mtd/ubi/wl.c b/trunk/drivers/mtd/ubi/wl.c
index 8421c7a9a835..7d32f71d6f1e 100644
--- a/trunk/drivers/mtd/ubi/wl.c
+++ b/trunk/drivers/mtd/ubi/wl.c
@@ -259,7 +259,6 @@ static int do_work(struct ubi_device *ubi)
 	 */
 	down_read(&ubi->work_sem);
 	spin_lock(&ubi->wl_lock);
-
 	if (list_empty(&ubi->works)) {
 		spin_unlock(&ubi->wl_lock);
 		up_read(&ubi->work_sem);
@@ -268,6 +267,8 @@ static int do_work(struct ubi_device *ubi)
 
 	wrk = list_entry(ubi->works.next, struct ubi_work, list);
 	list_del(&wrk->list);
+	ubi->works_count -= 1;
+	ubi_assert(ubi->works_count >= 0);
 	spin_unlock(&ubi->wl_lock);
 
 	/*
@@ -278,12 +279,8 @@ static int do_work(struct ubi_device *ubi)
 	err = wrk->func(ubi, wrk, 0);
 	if (err)
 		ubi_err("work failed with error code %d", err);
-
-	spin_lock(&ubi->wl_lock);
-	ubi->works_count -= 1;
-	ubi_assert(ubi->works_count >= 0);
-	spin_unlock(&ubi->wl_lock);
 	up_read(&ubi->work_sem);
+
 	return err;
 }