diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2008-02-05 02:44:47 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-07 05:34:36 -0500 |
commit | 53fb84a0695ffeeeadf8ae92db28cbccf5325531 (patch) | |
tree | d573cd02754704e0674821d759e39e9c7708eead /drivers/mtd/devices | |
parent | d5476689afd48e71395602698409e9f48cbba413 (diff) |
[MTD] [DOC200x] eccbuf is statically defined and always evaluate to true
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Acked-by: Joern Engel <joern@logfs.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r-- | drivers/mtd/devices/doc2000.c | 4 | ||||
-rw-r--r-- | drivers/mtd/devices/doc2001plus.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c index c73e96bfafc6..e9ce241b7fe5 100644 --- a/drivers/mtd/devices/doc2000.c +++ b/drivers/mtd/devices/doc2000.c | |||
@@ -632,7 +632,7 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len, | |||
632 | len = ((from | 0x1ff) + 1) - from; | 632 | len = ((from | 0x1ff) + 1) - from; |
633 | 633 | ||
634 | /* The ECC will not be calculated correctly if less than 512 is read */ | 634 | /* The ECC will not be calculated correctly if less than 512 is read */ |
635 | if (len != 0x200 && eccbuf) | 635 | if (len != 0x200) |
636 | printk(KERN_WARNING | 636 | printk(KERN_WARNING |
637 | "ECC needs a full sector read (adr: %lx size %lx)\n", | 637 | "ECC needs a full sector read (adr: %lx size %lx)\n", |
638 | (long) from, (long) len); | 638 | (long) from, (long) len); |
@@ -896,7 +896,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len, | |||
896 | /* Let the caller know we completed it */ | 896 | /* Let the caller know we completed it */ |
897 | *retlen += len; | 897 | *retlen += len; |
898 | 898 | ||
899 | if (eccbuf) { | 899 | { |
900 | unsigned char x[8]; | 900 | unsigned char x[8]; |
901 | size_t dummy; | 901 | size_t dummy; |
902 | int ret; | 902 | int ret; |
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c index 2b30b587c6e8..83be3461658f 100644 --- a/drivers/mtd/devices/doc2001plus.c +++ b/drivers/mtd/devices/doc2001plus.c | |||
@@ -748,7 +748,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len, | |||
748 | WriteDOC(DoC_GetDataOffset(mtd, &fto), docptr, Mplus_FlashCmd); | 748 | WriteDOC(DoC_GetDataOffset(mtd, &fto), docptr, Mplus_FlashCmd); |
749 | 749 | ||
750 | /* On interleaved devices the flags for 2nd half 512 are before data */ | 750 | /* On interleaved devices the flags for 2nd half 512 are before data */ |
751 | if (eccbuf && before) | 751 | if (before) |
752 | fto -= 2; | 752 | fto -= 2; |
753 | 753 | ||
754 | /* issue the Serial Data In command to initial the Page Program process */ | 754 | /* issue the Serial Data In command to initial the Page Program process */ |