aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/ubi/gluebi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-22 09:26:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-22 09:26:13 -0700
commit61fe087059614226978f4d7bb36da26cb2d28f9f (patch)
tree95558d4dfa3409bfedcac17f7a899082b37ad334 /drivers/mtd/ubi/gluebi.c
parent71c4c8b7c3bdeccef4f478c643a9ff382ec07241 (diff)
parent3dc948da783e713cd3dc8bbd8f293f8795af8f06 (diff)
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: fix bug in image sequence number handling UBI: gluebi: initialize ubi_num field
Diffstat (limited to 'drivers/mtd/ubi/gluebi.c')
-rw-r--r--drivers/mtd/ubi/gluebi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index 95aaac03f93..b5e478fa266 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -332,6 +332,7 @@ static int gluebi_create(struct ubi_device_info *di,
}
gluebi->vol_id = vi->vol_id;
+ gluebi->ubi_num = vi->ubi_num;
mtd->type = MTD_UBIVOLUME;
if (!di->ro_mode)
mtd->flags = MTD_WRITEABLE;