diff options
Diffstat (limited to 'drivers/mtd/nand/diskonchip.c')
-rw-r--r-- | drivers/mtd/nand/diskonchip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index 47067bc98248..b7f8de7b2780 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/mtd/mtd.h> | 29 | #include <linux/mtd/mtd.h> |
30 | #include <linux/mtd/nand.h> | 30 | #include <linux/mtd/nand.h> |
31 | #include <linux/mtd/doc2000.h> | 31 | #include <linux/mtd/doc2000.h> |
32 | #include <linux/mtd/compatmac.h> | ||
33 | #include <linux/mtd/partitions.h> | 32 | #include <linux/mtd/partitions.h> |
34 | #include <linux/mtd/inftl.h> | 33 | #include <linux/mtd/inftl.h> |
35 | 34 | ||
@@ -146,6 +145,7 @@ static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc) | |||
146 | uint8_t parity; | 145 | uint8_t parity; |
147 | uint16_t ds[4], s[5], tmp, errval[8], syn[4]; | 146 | uint16_t ds[4], s[5], tmp, errval[8], syn[4]; |
148 | 147 | ||
148 | memset(syn, 0, sizeof(syn)); | ||
149 | /* Convert the ecc bytes into words */ | 149 | /* Convert the ecc bytes into words */ |
150 | ds[0] = ((ecc[4] & 0xff) >> 0) | ((ecc[5] & 0x03) << 8); | 150 | ds[0] = ((ecc[4] & 0xff) >> 0) | ((ecc[5] & 0x03) << 8); |
151 | ds[1] = ((ecc[5] & 0xfc) >> 2) | ((ecc[2] & 0x0f) << 6); | 151 | ds[1] = ((ecc[5] & 0xfc) >> 2) | ((ecc[2] & 0x0f) << 6); |
@@ -169,9 +169,9 @@ static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc) | |||
169 | s[i] ^= rs->alpha_to[rs_modnn(rs, tmp + (FCR + i) * j)]; | 169 | s[i] ^= rs->alpha_to[rs_modnn(rs, tmp + (FCR + i) * j)]; |
170 | } | 170 | } |
171 | 171 | ||
172 | /* Calc s[i] = s[i] / alpha^(v + i) */ | 172 | /* Calc syn[i] = s[i] / alpha^(v + i) */ |
173 | for (i = 0; i < NROOTS; i++) { | 173 | for (i = 0; i < NROOTS; i++) { |
174 | if (syn[i]) | 174 | if (s[i]) |
175 | syn[i] = rs_modnn(rs, rs->index_of[s[i]] + (NN - FCR - i)); | 175 | syn[i] = rs_modnn(rs, rs->index_of[s[i]] + (NN - FCR - i)); |
176 | } | 176 | } |
177 | /* Call the decoder library */ | 177 | /* Call the decoder library */ |