| Message ID | 1460446235-987-1-git-send-email-zengzhaoxiu@163.com |
|---|---|
| State | Accepted |
| Commit | 03a97550941d17c7d5b621afde5945bbc0da6546 |
| Headers | show |
On Tue, 12 Apr 2016 15:30:35 +0800 zengzhaoxiu@163.com wrote: > From: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com> > > If there is only one bit difference in the ECC, the function should return 1. > The result of "diff0 & ~(1<<fls(diff0))" is equal to diff0, so the function > actually returns -1. > > Signed-off-by: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com> Applied. Thanks, Boris > --- > drivers/mtd/nand/s3c2410.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c > index 9c9397b..86ffb73 100644 > --- a/drivers/mtd/nand/s3c2410.c > +++ b/drivers/mtd/nand/s3c2410.c > @@ -542,7 +542,8 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat, > diff0 |= (diff1 << 8); > diff0 |= (diff2 << 16); > > - if ((diff0 & ~(1<<fls(diff0))) == 0) > + /* equal to "(diff0 & ~(1 << __ffs(diff0)))" */ > + if ((diff0 & (diff0 - 1)) == 0) > return 1; > > return -1;
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 9c9397b..86ffb73 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c @@ -542,7 +542,8 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat, diff0 |= (diff1 << 8); diff0 |= (diff2 << 16); - if ((diff0 & ~(1<<fls(diff0))) == 0) + /* equal to "(diff0 & ~(1 << __ffs(diff0)))" */ + if ((diff0 & (diff0 - 1)) == 0) return 1; return -1;