Merge tag 'usb-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[deliverable/linux.git] / drivers / mtd / nand / nand_ecc.c

diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index 97c4c0216c90727b79bb58425aa9cdd9e2493792..d1770b06639676e2b1da9286faee20abc00db939 100644 (file)
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -424,7 +424,7 @@ int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf,
                       unsigned char *code)
 {
        __nand_calculate_ecc(buf,
-                       ((struct nand_chip *)mtd->priv)->ecc.size, code);
+                       mtd_to_nand(mtd)->ecc.size, code);
 
        return 0;
 }
@@ -507,7 +507,7 @@ int __nand_correct_data(unsigned char *buf,
                return 1;       /* error in ECC data; no action needed */
 
        pr_err("%s: uncorrectable ECC error\n", __func__);
-       return -1;
+       return -EBADMSG;
 }
 EXPORT_SYMBOL(__nand_correct_data);
 
@@ -524,7 +524,7 @@ int nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
                      unsigned char *read_ecc, unsigned char *calc_ecc)
 {
        return __nand_correct_data(buf, read_ecc, calc_ecc,
-                                  ((struct nand_chip *)mtd->priv)->ecc.size);
+                                  mtd_to_nand(mtd)->ecc.size);
 }
 EXPORT_SYMBOL(nand_correct_data);