diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-11-01 16:18:43 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-01 16:18:43 +0100 |
| commit | 3ec53148eb68ddfb0c3311fb4c06cd2bd0ef3eeb (patch) | |
| tree | 2f780547f462895413e6e26dd6e331824bed35f0 /fs/jffs2/jffs2_1pass.c | |
| parent | b24ef56587a2a9295de55e526a365e6af3ab2581 (diff) | |
| parent | a47f957ab523019992fdef857af01bd71c58a4da (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'fs/jffs2/jffs2_1pass.c')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 0177268c3..920d2fd45 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -449,20 +449,18 @@ static inline void *get_node_mem(u32 off) static inline void put_fl_mem(void *buf) { -#if defined(CONFIG_JFFS2_NAND) && \ - defined(CONFIG_CMD_NAND) struct mtdids *id = current_part->dev->id; - if (id->type == MTD_DEV_TYPE_NAND) + switch (id->type) { +#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND) + case MTD_DEV_TYPE_NAND: return put_fl_mem_nand(buf); #endif - #if defined(CONFIG_CMD_ONENAND) - struct mtdids *id = current_part->dev->id; - - if (id->type == MTD_DEV_TYPE_ONENAND) + case MTD_DEV_TYPE_ONENAND: return put_fl_mem_onenand(buf); #endif + } } /* Compression names */ |