diff options
| author | bernard <[email protected]> | 2013-10-10 00:22:59 +0900 |
|---|---|---|
| committer | bernard <[email protected]> | 2013-10-10 00:22:59 +0900 |
| commit | 1ffb99e6f58d2ba8d9e0f0cfba2bbb158c0ecee7 (patch) | |
| tree | c5e438f5db85072b981923d64572cdb763ca4372 /components/dfs | |
| parent | f1107f6714a2d6e53f94c957fb352846407c56f9 (diff) | |
| parent | 83bb05419f7aba80f6a10a48f88a2838a356737a (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'components/dfs')
| -rw-r--r-- | components/dfs/filesystems/jffs2/dfs_jffs2.c | 1 | ||||
| -rw-r--r-- | components/dfs/filesystems/jffs2/src/fs-ecos.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/components/dfs/filesystems/jffs2/dfs_jffs2.c b/components/dfs/filesystems/jffs2/dfs_jffs2.c index 3b96295c76..6516797544 100644 --- a/components/dfs/filesystems/jffs2/dfs_jffs2.c +++ b/components/dfs/filesystems/jffs2/dfs_jffs2.c @@ -178,6 +178,7 @@ static int dfs_jffs2_mount(struct dfs_filesystem* fs, result = jffs2_mount(NULL, mte); if (result != 0) { + device_partition[index].dev = NULL; return jffs2_result_to_dfs(result); } /* save this pointer */ diff --git a/components/dfs/filesystems/jffs2/src/fs-ecos.c b/components/dfs/filesystems/jffs2/src/fs-ecos.c index 5f3b5d607c..814d2e3010 100644 --- a/components/dfs/filesystems/jffs2/src/fs-ecos.c +++ b/components/dfs/filesystems/jffs2/src/fs-ecos.c @@ -747,7 +747,7 @@ int jffs2_open(cyg_mtab_entry * mte, cyg_dir dir, const char *name, } // Initialise the file object - file->f_flag |= mode & CYG_FILE_MODE_MASK; + file->f_flag = mode & CYG_FILE_MODE_MASK; file->f_type = CYG_FILE_TYPE_FILE; file->f_ops = &jffs2_fileops; file->f_offset = (mode & O_APPEND) ? node->i_size : 0; @@ -1065,6 +1065,7 @@ static int jffs2_opendir(cyg_mtab_entry * mte, cyg_dir dir, const char *name, // Initialize the file object, setting the f_ops field to a // special set of file ops. + file->f_flag = 0; file->f_type = CYG_FILE_TYPE_FILE; file->f_ops = &jffs2_dirops; file->f_offset = 0; |