| From d098093ba06eb032057d1aca1c2e45889e099d00 Mon Sep 17 00:00:00 2001 |
| From: Boris Brezillon <boris.brezillon@bootlin.com> |
| Date: Sun, 28 Oct 2018 12:29:55 +0100 |
| Subject: mtd: nand: Fix nanddev_neraseblocks() |
| |
| From: Boris Brezillon <boris.brezillon@bootlin.com> |
| |
| commit d098093ba06eb032057d1aca1c2e45889e099d00 upstream. |
| |
| nanddev_neraseblocks() currently returns the number pages per LUN |
| instead of the total number of eraseblocks. |
| |
| Fixes: 9c3736a3de21 ("mtd: nand: Add core infrastructure to deal with NAND devices") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> |
| Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| include/linux/mtd/nand.h | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/include/linux/mtd/nand.h |
| +++ b/include/linux/mtd/nand.h |
| @@ -324,9 +324,8 @@ static inline unsigned int nanddev_ntarg |
| */ |
| static inline unsigned int nanddev_neraseblocks(const struct nand_device *nand) |
| { |
| - return (u64)nand->memorg.luns_per_target * |
| - nand->memorg.eraseblocks_per_lun * |
| - nand->memorg.pages_per_eraseblock; |
| + return nand->memorg.ntargets * nand->memorg.luns_per_target * |
| + nand->memorg.eraseblocks_per_lun; |
| } |
| |
| /** |
