2018-07-04 08:27:02

by Wei Yongjun

Subject: [PATCH -next] mtd: spinand: Fix error return code in spinand_init()

Fix to return error code -ENOMEM from the kzalloc() error handling
case instead of 0, as done elsewhere in this function.

Fixes: c898e0526fb6 ("mtd: nand: Add core infrastructure to support SPI NANDs")
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/mtd/nand/spi/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 17d207a..011683e 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -985,8 +985,10 @@ static int spinand_init(struct spinand_device *spinand)
spinand->databuf = kzalloc(nanddev_page_size(nand) +
nanddev_per_page_oobsize(nand),
GFP_KERNEL);
- if (!spinand->databuf)
+ if (!spinand->databuf) {
+ ret = -ENOMEM;
goto err_free_bufs;
+ }

spinand->oobbuf = spinand->databuf + nanddev_page_size(nand);

2018-07-04 08:30:19

by Boris Brezillon

Subject: Re: [PATCH -next] mtd: spinand: Fix error return code in spinand_init()

On Wed, 4 Jul 2018 08:34:58 +0000
Wei Yongjun <[email protected]> wrote:

> Fix to return error code -ENOMEM from the kzalloc() error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: c898e0526fb6 ("mtd: nand: Add core infrastructure to support SPI NANDs")
> Signed-off-by: Wei Yongjun <[email protected]>

Acked-by: Boris Brezillon <[email protected]>

> ---
> drivers/mtd/nand/spi/core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
> index 17d207a..011683e 100644
> --- a/drivers/mtd/nand/spi/core.c
> +++ b/drivers/mtd/nand/spi/core.c
> @@ -985,8 +985,10 @@ static int spinand_init(struct spinand_device *spinand)
> spinand->databuf = kzalloc(nanddev_page_size(nand) +
> nanddev_per_page_oobsize(nand),
> GFP_KERNEL);
> - if (!spinand->databuf)
> + if (!spinand->databuf) {
> + ret = -ENOMEM;
> goto err_free_bufs;
> + }
>
> spinand->oobbuf = spinand->databuf + nanddev_page_size(nand);
>

2018-07-08 21:50:56

by Miquel Raynal

Subject: Re: [PATCH -next] mtd: spinand: Fix error return code in spinand_init()

Hi Wei,

Wei Yongjun <[email protected]> wrote on Wed, 4 Jul 2018 08:34:58
+0000:

> Fix to return error code -ENOMEM from the kzalloc() error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: c898e0526fb6 ("mtd: nand: Add core infrastructure to support SPI NANDs")
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/mtd/nand/spi/core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)


Merged with the original commit.

Thanks,
Miquèl