X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Ftest-framework%2Fyaffs_nand_drv.c;h=8f2557935f4f5fcc1681711c022247ac887e4d86;hb=f83f5b03c1eea3fe26a0929583ffbd16df7c64f0;hp=f739d1d99e5169621f9fdfe1400d7529c4059550;hpb=b4d5215f18486403d16f2e776000e43eba052f40;p=yaffs2.git diff --git a/direct/test-framework/yaffs_nand_drv.c b/direct/test-framework/yaffs_nand_drv.c index f739d1d..8f25579 100644 --- a/direct/test-framework/yaffs_nand_drv.c +++ b/direct/test-framework/yaffs_nand_drv.c @@ -1,8 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2011 Aleph One Ltd. - * for Toby Churchill Ltd and Brightstar Engineering + * Copyright (C) 2002-2018 Aleph One Ltd. * * Created by Charles Manning * @@ -68,7 +67,7 @@ static int yaffs_nand_drv_WriteChunk(struct yaffs_dev *dev, int nand_chunk, struct nanddrv_transfer tr[2]; int i; - if(!data || !oob) + if(!data) return YAFFS_FAIL; @@ -79,7 +78,8 @@ static int yaffs_nand_drv_WriteChunk(struct yaffs_dev *dev, int nand_chunk, for(i = 0, e = buffer + 2; i < chip->data_bytes_per_page; i+=256, e+=3) yaffs_ecc_calc(data + i, e); - memcpy(buffer + 26, oob, oob_len); + if (oob) + memcpy(buffer + 26, oob, oob_len); /* Set up and execute transfer */