diff options
| author | pekon gupta <pekon@ti.com> | 2014-04-11 12:55:35 +0530 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-06 17:46:00 -0400 |
| commit | 3f990dc83bc3197b17bd847241671917826152cc (patch) | |
| tree | 60f13c8f784a1df0d5252d8a6262f4239295ff28 /drivers/mtd | |
| parent | a09431da381ce8d1b4d48e1cbca5f2b4eea662f4 (diff) | |
| download | u-boot-imx-3f990dc83bc3197b17bd847241671917826152cc.zip u-boot-imx-3f990dc83bc3197b17bd847241671917826152cc.tar.gz u-boot-imx-3f990dc83bc3197b17bd847241671917826152cc.tar.bz2 | |
mtd: nand: omap: fix error-codes returned from omap-elm driver
This patch
omap-elm.c: replaces -ve integer value returned during errorneous condition,
with proper error-codes.
omap-gpmc.c: updates omap-gpmc driver to pass error-codes returned from
omap-elm driver to upper layers
Signed-off-by: Pekon Gupta <pekon@ti.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/omap_elm.c | 7 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap_gpmc.c | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c index afa629a..d963e6c 100644 --- a/drivers/mtd/nand/omap_elm.c +++ b/drivers/mtd/nand/omap_elm.c @@ -19,6 +19,7 @@ #include <linux/mtd/omap_elm.h> #include <asm/arch/hardware.h> +#define DRIVER_NAME "omap-elm" #define ELM_DEFAULT_POLY (0) struct elm *elm_cfg; @@ -113,8 +114,10 @@ int elm_check_error(u8 *syndrome, enum bch_level bch_type, u32 *error_count, /* check if correctable */ location_status = readl(&elm_cfg->error_location[poly].location_status); - if (!(location_status & ELM_LOCATION_STATUS_ECC_CORRECTABLE_MASK)) - return -1; + if (!(location_status & ELM_LOCATION_STATUS_ECC_CORRECTABLE_MASK)) { + printf("%s: uncorrectable ECC errors\n", DRIVER_NAME); + return -EBADMSG; + } /* get error count */ *error_count = readl(&elm_cfg->error_location[poly].location_status) & diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c index 2d893e1..d2fedf9 100644 --- a/drivers/mtd/nand/omap_gpmc.c +++ b/drivers/mtd/nand/omap_gpmc.c @@ -370,10 +370,10 @@ static int omap_correct_data_bch(struct mtd_info *mtd, uint8_t *dat, } /* use elm module to check for errors */ elm_config(bch_type); - if (elm_check_error(calc_ecc, bch_type, &error_count, error_loc)) { - printf("nand: error: uncorrectable ECC errors\n"); - return -EINVAL; - } + err = elm_check_error(calc_ecc, bch_type, &error_count, error_loc); + if (err) + return err; + /* correct bch error */ for (count = 0; count < error_count; count++) { switch (info->ecc_scheme) { |