| Message ID | 20181213105526.30871-1-boris.brezillon@bootlin.com |
|---|---|
| State | Accepted |
| Delegated to: | Miquel Raynal |
| Headers | show |
| Series | mtd: rawnand: Fix JEDEC detection | expand |
Hi Boris, Boris Brezillon <boris.brezillon@bootlin.com> wrote on Thu, 13 Dec 2018 11:55:26 +0100: > nand_jedec_detect() should return 1 when the PARAM page parsing > succeeds, otherwise the core considers JEDEC detection failed and falls > back to ID-based detection. > > Fixes: 480139d9229e ("mtd: rawnand: get rid of the JEDEC parameter page in nand_chip") > Cc: <stable@vger.kernel.org> > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> > --- > drivers/mtd/nand/raw/nand_jedec.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c > index 5c26492c841d..38b5dc22cb30 100644 > --- a/drivers/mtd/nand/raw/nand_jedec.c > +++ b/drivers/mtd/nand/raw/nand_jedec.c > @@ -107,6 +107,8 @@ int nand_jedec_detect(struct nand_chip *chip) > pr_warn("Invalid codeword size\n"); > } > > + ret = 1; > + > free_jedec_param_page: > kfree(p); > return ret; Sorry for the mistake. Acked-by: Miquel Raynal <miquel.raynal@bootlin.com> Thanks, Miquèl
On Thu, 13 Dec 2018 11:57:01 +0100 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > Hi Boris, > > Boris Brezillon <boris.brezillon@bootlin.com> wrote on Thu, 13 Dec 2018 > 11:55:26 +0100: > > > nand_jedec_detect() should return 1 when the PARAM page parsing > > succeeds, otherwise the core considers JEDEC detection failed and falls > > back to ID-based detection. > > > > Fixes: 480139d9229e ("mtd: rawnand: get rid of the JEDEC parameter page in nand_chip") > > Cc: <stable@vger.kernel.org> > > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> > > --- > > drivers/mtd/nand/raw/nand_jedec.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c > > index 5c26492c841d..38b5dc22cb30 100644 > > --- a/drivers/mtd/nand/raw/nand_jedec.c > > +++ b/drivers/mtd/nand/raw/nand_jedec.c > > @@ -107,6 +107,8 @@ int nand_jedec_detect(struct nand_chip *chip) > > pr_warn("Invalid codeword size\n"); > > } > > > > + ret = 1; > > + > > free_jedec_param_page: > > kfree(p); > > return ret; > > Sorry for the mistake. > > Acked-by: Miquel Raynal <miquel.raynal@bootlin.com> Can you queue that one to nand/next?
Hi Boris, Boris Brezillon <boris.brezillon@bootlin.com> wrote on Thu, 13 Dec 2018 11:55:26 +0100: > nand_jedec_detect() should return 1 when the PARAM page parsing > succeeds, otherwise the core considers JEDEC detection failed and falls > back to ID-based detection. > > Fixes: 480139d9229e ("mtd: rawnand: get rid of the JEDEC parameter page in nand_chip") > Cc: <stable@vger.kernel.org> > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> > --- > drivers/mtd/nand/raw/nand_jedec.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c > index 5c26492c841d..38b5dc22cb30 100644 > --- a/drivers/mtd/nand/raw/nand_jedec.c > +++ b/drivers/mtd/nand/raw/nand_jedec.c > @@ -107,6 +107,8 @@ int nand_jedec_detect(struct nand_chip *chip) > pr_warn("Invalid codeword size\n"); > } > > + ret = 1; > + > free_jedec_param_page: > kfree(p); > return ret; Applied on nand/next. Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c index 5c26492c841d..38b5dc22cb30 100644 --- a/drivers/mtd/nand/raw/nand_jedec.c +++ b/drivers/mtd/nand/raw/nand_jedec.c @@ -107,6 +107,8 @@ int nand_jedec_detect(struct nand_chip *chip) pr_warn("Invalid codeword size\n"); } + ret = 1; + free_jedec_param_page: kfree(p); return ret;
nand_jedec_detect() should return 1 when the PARAM page parsing succeeds, otherwise the core considers JEDEC detection failed and falls back to ID-based detection. Fixes: 480139d9229e ("mtd: rawnand: get rid of the JEDEC parameter page in nand_chip") Cc: <stable@vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- drivers/mtd/nand/raw/nand_jedec.c | 2 ++ 1 file changed, 2 insertions(+)