projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'time_upgrade'
[yaffs2.git]
/
yaffs_guts.c
diff --git
a/yaffs_guts.c
b/yaffs_guts.c
index a2b4cdf696114a2d89ab639c1ab0f35ee126221b..c05aee0c8bf8340c751c525c3944242edd0df804 100644
(file)
--- a/
yaffs_guts.c
+++ b/
yaffs_guts.c
@@
-3017,8
+3017,10
@@
static void yaffs_check_obj_details_loaded(struct yaffs_obj *in)
result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, buf, &tags);
result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, buf, &tags);
- if (result == YAFFS_FAIL)
+ if (result == YAFFS_FAIL) {
+ yaffs_release_temp_buffer(dev, buf);
return;
return;
+ }
oh = (struct yaffs_obj_hdr *)buf;
oh = (struct yaffs_obj_hdr *)buf;
@@
-3201,7
+3203,6
@@
int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
bi->has_shrink_hdr = 1;
}
bi->has_shrink_hdr = 1;
}
-
return new_chunk_id;
}
return new_chunk_id;
}
@@
-4826,6
+4827,7
@@
void yaffs_deinitialise(struct yaffs_dev *dev)
kfree(dev->checkpt_block_list);
dev->checkpt_block_list = NULL;
kfree(dev->checkpt_block_list);
dev->checkpt_block_list = NULL;
+ dev->ll_init = 0;
dev->is_mounted = 0;
yaffs_deinit_nand(dev);
dev->is_mounted = 0;
yaffs_deinit_nand(dev);