diff options
| author | Timothy Manning <tfhmanning@gmail.com> | 2011-12-08 11:01:43 +1300 |
|---|---|---|
| committer | Timothy Manning <tfhmanning@gmail.com> | 2011-12-08 11:01:43 +1300 |
| commit | d7388fb75a13610d14d0afc397f826bd44c972e1 (patch) | |
| tree | 9119aa4f41683a197f3ebc93f1352f19dcf2298e /direct/yaffs_nandif.c | |
| parent | 8cbfc1e273db791447911631e80c0495c6171ca8 (diff) | |
| parent | d43e901b5bf74d8d40dda18f0d5da15c76245510 (diff) | |
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
Diffstat (limited to 'direct/yaffs_nandif.c')
| -rw-r--r-- | direct/yaffs_nandif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c index e103757..b93b55a 100644 --- a/direct/yaffs_nandif.c +++ b/direct/yaffs_nandif.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning <charles@aleph1.co.uk> @@ -92,7 +92,7 @@ int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int nand_chunk, if(!data) { localData = 1; - data = yaffs_get_temp_buffer(dev,__LINE__); + data = yaffs_get_temp_buffer(dev); } spare = NULL; spareSize = 0; @@ -133,7 +133,7 @@ int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int nand_chunk, } if(localData) - yaffs_release_temp_buffer(dev,data,__LINE__); + yaffs_release_temp_buffer(dev, data); return retval; } @@ -184,7 +184,7 @@ int ynandif_QueryNANDBlock(struct yaffs_dev *dev, int blockId, } else { - *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING; + *state = YAFFS_BLOCK_STATE_NEEDS_SCAN; *seq_number = tags.seq_number; } } |