From 09a4d4a7ac4eb3d0a2723ab4d8320d9d44f77735 Mon Sep 17 00:00:00 2001
From: Phil Carmody <ext-phil.2.carmody@nokia.com>
Date: Thu, 23 Jul 2009 15:29:10 +0200
Subject: [PATCH] --- yaml --- r: 164042 b: refs/heads/master c:
 758d8e46347aee199e7025b8c571bab75d2de63f h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mtd/ubi/ubi.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 19a866926195..d79cbbe646c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a406856ea6830d8b8dba6a27d9f9331c5f4c13a
+refs/heads/master: 758d8e46347aee199e7025b8c571bab75d2de63f
diff --git a/trunk/drivers/mtd/ubi/ubi.h b/trunk/drivers/mtd/ubi/ubi.h
index 6a5fe9633783..c290f51dd178 100644
--- a/trunk/drivers/mtd/ubi/ubi.h
+++ b/trunk/drivers/mtd/ubi/ubi.h
@@ -579,7 +579,8 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol,
 	for (rb = rb_first(root),                                            \
 	     pos = (rb ? container_of(rb, typeof(*pos), member) : NULL);     \
 	     rb;                                                             \
-	     rb = rb_next(rb), pos = container_of(rb, typeof(*pos), member))
+	     rb = rb_next(rb),                                               \
+	     pos = (rb ? container_of(rb, typeof(*pos), member) : NULL))
 
 /**
  * ubi_zalloc_vid_hdr - allocate a volume identifier header object.