summaryrefslogtreecommitdiff
path: root/drivers/mtd/ubi
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-12-16 17:16:34 +0100
committerWolfgang Denk <wd@denx.de>2008-12-16 17:16:34 +0100
commit7f202217356f19e519e6ec57a29de9af73067037 (patch)
tree1c3fe822cc37bf4df09ac9ece94c8a71ab9a25d0 /drivers/mtd/ubi
parent6cdadcb3f1b6eac4a1c4256acaa1438413f95351 (diff)
parent584eedab66d0828f2d571a24b10526c4e65f547b (diff)
downloadu-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.zip
u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.gz
u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.bz2
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'drivers/mtd/ubi')
-rw-r--r--drivers/mtd/ubi/crc32.c2
-rw-r--r--drivers/mtd/ubi/io.c2
-rw-r--r--drivers/mtd/ubi/vmt.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/crc32.c b/drivers/mtd/ubi/crc32.c
index 5273ca3..a7e26b0 100644
--- a/drivers/mtd/ubi/crc32.c
+++ b/drivers/mtd/ubi/crc32.c
@@ -97,7 +97,7 @@ u32 crc32_le(u32 crc, unsigned char const *p, size_t len)
# else
# define DO_CRC(x) crc = tab[ ((crc >> 24) ^ (x)) & 255] ^ (crc<<8)
# endif
- //printf("Crc32_le crc=%x\n",crc);
+ /* printf("Crc32_le crc=%x\n",crc); */
crc = __cpu_to_le32(crc);
/* Align it */
if((((long)b)&3 && len)){
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 2d44f23..8423894 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -186,7 +186,7 @@ retry:
if (read != len && err == -EBADMSG) {
ubi_assert(0);
printk("%s[%d] not here\n", __func__, __LINE__);
-// err = -EIO;
+/* err = -EIO; */
}
} else {
ubi_assert(len == read);
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index a87a2f3..061da64 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -260,7 +260,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
goto out_unlock;
}
- /* Calculate how many eraseblocks are requested */
+ /* Calculate how many eraseblocks are requested */
vol->usable_leb_size = ubi->leb_size - ubi->leb_size % req->alignment;
bytes = req->bytes;
if (do_div(bytes, vol->usable_leb_size))