[PATCH] mtd: fix wrong return values in cdev read

[PATCH] mtd: fix wrong return values in cdev read

[Sascha Hauer]

mtd->read returns the number of bitflips as positive numbers.
Instead of returning these numbers Return -EUCLEAN when the bitflip
threshold has been reached, 0 otherwise.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/core.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index f63b10e..57b0fad 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -74,12 +74,11 @@ static ssize_t mtd_op_read(struct cdev *cdev, void* buf, size_t count,
 			offset, count);
 
 	ret = mtd_read(mtd, offset, count, &retlen, buf);
-
-	if(ret) {
-		printf("err %d\n", ret);
+	if (ret < 0)
 		return ret;
-	}
-	return retlen;
+	if (mtd->ecc_strength == 0)
+		return 0;	/* device lacks ecc */
+	return ret >= mtd->bitflip_threshold ? -EUCLEAN : 0;
 }
 
 #define NOTALIGNED(x) (x & (mtd->writesize - 1)) != 0
-- 
1.8.5.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] mtd: fix wrong return values in cdev read

[Sascha Hauer]

On Thu, Dec 19, 2013 at 04:21:23PM +0100, Sascha Hauer wrote:
> mtd->read returns the number of bitflips as positive numbers.
> Instead of returning these numbers Return -EUCLEAN when the bitflip
> threshold has been reached, 0 otherwise.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  drivers/mtd/core.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
> index f63b10e..57b0fad 100644
> --- a/drivers/mtd/core.c
> +++ b/drivers/mtd/core.c
> @@ -74,12 +74,11 @@ static ssize_t mtd_op_read(struct cdev *cdev, void* buf, size_t count,
>  			offset, count);
>  
>  	ret = mtd_read(mtd, offset, count, &retlen, buf);
> -
> -	if(ret) {
> -		printf("err %d\n", ret);
> +	if (ret < 0)
>  		return ret;
> -	}
> -	return retlen;
> +	if (mtd->ecc_strength == 0)
> +		return 0;	/* device lacks ecc */
> +	return ret >= mtd->bitflip_threshold ? -EUCLEAN : 0;

This is not correct. We have to return retlen, not 0. Will resend along
with some other fixes.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox