diff options
author | Nicolas Pitre <nico@cam.org> | 2005-08-06 00:51:33 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-06 14:13:52 -0500 |
commit | 59da721a2288b8aec751a2716f7ab60f2ea0c925 (patch) | |
tree | 902a0a61cd3ed7e2dab27f20b4fd541566f598a1 /fs/jffs2/fs.c | |
parent | e102d54abf6806b95c89142cd0b7e94d709ebcd7 (diff) |
[JFFS2] Teach JFFS2 about Sibley flash
Intels Sibley flash needs JFFS2 write buffer functionality
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/fs.c')
-rw-r--r-- | fs/jffs2/fs.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index cc18b92234c..79b4bdc76f7 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: fs.c,v 1.61 2005/07/24 15:29:56 dedekind Exp $ | 10 | * $Id: fs.c,v 1.62 2005/08/06 04:51:30 nico Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -664,7 +664,14 @@ static int jffs2_flash_setup(struct jffs2_sb_info *c) { | |||
664 | if (ret) | 664 | if (ret) |
665 | return ret; | 665 | return ret; |
666 | } | 666 | } |
667 | 667 | ||
668 | /* and Intel "Sibley" flash */ | ||
669 | if (jffs2_nor_wbuf_flash(c)) { | ||
670 | ret = jffs2_nor_wbuf_flash_setup(c); | ||
671 | if (ret) | ||
672 | return ret; | ||
673 | } | ||
674 | |||
668 | return ret; | 675 | return ret; |
669 | } | 676 | } |
670 | 677 | ||
@@ -683,4 +690,9 @@ void jffs2_flash_cleanup(struct jffs2_sb_info *c) { | |||
683 | if (jffs2_dataflash(c)) { | 690 | if (jffs2_dataflash(c)) { |
684 | jffs2_dataflash_cleanup(c); | 691 | jffs2_dataflash_cleanup(c); |
685 | } | 692 | } |
693 | |||
694 | /* and Intel "Sibley" flash */ | ||
695 | if (jffs2_nor_wbuf_flash(c)) { | ||
696 | jffs2_nor_wbuf_flash_cleanup(c); | ||
697 | } | ||
686 | } | 698 | } |