diff --git a/Makefile b/Makefile
index 190f931..05c45d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 2013
 PATCHLEVEL = 10
-SUBLEVEL = 0
+SUBLEVEL = 1
 EXTRAVERSION =
 NAME = La tour Eiffel
 
diff --git a/arch/arm/mach-mxs/bcb.c b/arch/arm/mach-mxs/bcb.c
index af51d24..b5d793e 100644
--- a/arch/arm/mach-mxs/bcb.c
+++ b/arch/arm/mach-mxs/bcb.c
@@ -265,7 +265,7 @@
 
 	chip->select_chip(mtd, 0);
 	chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
-	ret = chip->ecc.read_page_raw(mtd, chip, buf);
+	ret = chip->ecc.read_page_raw(mtd, chip, buf, 1, page);
 	if (ret) {
 		printf("Failed to read FCB from page %u: %d\n", page, ret);
 		return ret;
@@ -306,7 +306,7 @@
 
 	printf("Writing FCB to block %08x\n", block);
 	chip->select_chip(mtd, 0);
-	ret = chip->write_page(mtd, chip, buf, page, 0, 1);
+	ret = chip->write_page(mtd, chip, 0, mtd->erasesize, buf, 1, page, 0, 1);
 	if (ret) {
 		printf("Failed to write FCB to block %08x: %d\n", block, ret);
 	}
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 2eb5133..30bcf66 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -817,7 +817,7 @@
 	omap_i2c_init(i2c_omap);
 
 	dev_info(pdev, "bus %d rev%d.%d at %d kHz\n",
-		 pdev->id, i2c_omap->rev >> 4, i2c_omap->rev & 0xf, i2c_omap->speed);
+		 pdev->id, major, minor, i2c_omap->speed);
 
 	omap_i2c_idle(i2c_omap);
 
diff --git a/fs/fs.c b/fs/fs.c
index d913a50..75801d3 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -721,8 +721,7 @@
 	if (ret)
 		goto out;
 
-
-	if (flags & O_TRUNC) {
+	if (!(s.st_mode & S_IFCHR) && (flags & O_TRUNC)) {
 		ret = fsdrv->truncate(&fsdev->dev, f, 0);
 		f->size = 0;
 		if (ret)