fs: ext4: Fix alignment of cache buffers

[oweals/u-boot.git] / fs / jffs2 / jffs2_1pass.c

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 4c6dfbf249dcce4ca39fac03343198b4db3b823a..5912cde83840f1b997cdb46251286f6912f8813f 100644 (file)
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -118,6 +118,7 @@
 #include <linux/compiler.h>
 #include <linux/stat.h>
 #include <linux/time.h>
+#include <u-boot/crc.h>
 #include <watchdog.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/jffs2_1pass.h>
@@ -201,7 +202,7 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf)
 
                        retlen = NAND_CACHE_SIZE;
                        if (nand_read(mtd, nand_cache_off,
-                                     &retlen, nand_cache) != 0 ||
+                                     &retlen, nand_cache) < 0 ||
                                        retlen != NAND_CACHE_SIZE) {
                                printf("read_nand_cached: error reading nand off %#x size %d bytes\n",
                                                nand_cache_off, NAND_CACHE_SIZE);
@@ -300,7 +301,7 @@ static int read_onenand_cached(u32 off, u32 size, u_char *buf)
 
                        retlen = ONENAND_CACHE_SIZE;
                        if (onenand_read(&onenand_mtd, onenand_cache_off, retlen,
-                                               &retlen, onenand_cache) != 0 ||
+                                               &retlen, onenand_cache) < 0 ||
                                        retlen != ONENAND_CACHE_SIZE) {
                                printf("read_onenand_cached: error reading nand off %#x size %d bytes\n",
                                        onenand_cache_off, ONENAND_CACHE_SIZE);