summaryrefslogtreecommitdiff
path: root/fs/ext2/ext2fs.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-08-10 22:20:27 +0200
committerWolfgang Denk <wd@denx.de>2010-08-10 22:20:27 +0200
commit201532a69cf7e7a84bff354fdab45947425d22b4 (patch)
tree4a09ca44e9fb720ec5b6ef29cca2de627e29f29a /fs/ext2/ext2fs.c
parent560639806da5172147a3b1ebd99839feac38b718 (diff)
parentb417260d871d4d8d336c160d95ed40cc8c0fb0fa (diff)
downloadu-boot-imx-201532a69cf7e7a84bff354fdab45947425d22b4.zip
u-boot-imx-201532a69cf7e7a84bff354fdab45947425d22b4.tar.gz
u-boot-imx-201532a69cf7e7a84bff354fdab45947425d22b4.tar.bz2
Merge branch 'master' of ../master
Diffstat (limited to 'fs/ext2/ext2fs.c')
-rw-r--r--fs/ext2/ext2fs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index 4b391d6..a88cf87 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -364,7 +364,7 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) {
indir2_size = blksz;
}
if ((__le32_to_cpu (indir1_block[rblock / perblock]) <<
- log2_blksz) != indir1_blkno) {
+ log2_blksz) != indir2_blkno) {
status = ext2fs_devread (__le32_to_cpu(indir1_block[rblock / perblock]) << log2_blksz,
0, blksz,
(char *) indir2_block);