Message ID | 20160829032052.3855-1-judge.packham@gmail.com |
---|---|
State | Accepted |
Commit | 91395b5d4ebb07bf6488058f0ba37256856816f6 |
Delegated to: | Scott Wood |
Headers | show |
On Mon, Aug 29, 2016 at 3:20 PM, Chris Packham <judge.packham@gmail.com> wrote: > In commit 17cb4b8f327e ("mtd: nand: Add+use mtd_to/from_nand and > nand_get/set_controller_data") the assignment of mtd->priv was removed > but was not replaced. This adds the required nand_set_controller_data() > call. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > --- > > drivers/mtd/nand/pxa3xx_nand.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c > index d3ac5391f156..b1d58e036a1d 100644 > --- a/drivers/mtd/nand/pxa3xx_nand.c > +++ b/drivers/mtd/nand/pxa3xx_nand.c > @@ -1496,6 +1496,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info) > host->read_id_bytes = 4; > mtd->owner = THIS_MODULE; > > + nand_set_controller_data(chip, host); > chip->ecc.read_page = pxa3xx_nand_read_page_hwecc; > chip->ecc.write_page = pxa3xx_nand_write_page_hwecc; > chip->controller = &info->controller; > -- > 2.9.2.518.ged577c6.dirty > Ping? I think this probably needs to be in for 2016.09.
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index d3ac5391f156..b1d58e036a1d 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1496,6 +1496,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info) host->read_id_bytes = 4; mtd->owner = THIS_MODULE; + nand_set_controller_data(chip, host); chip->ecc.read_page = pxa3xx_nand_read_page_hwecc; chip->ecc.write_page = pxa3xx_nand_write_page_hwecc; chip->controller = &info->controller;
In commit 17cb4b8f327e ("mtd: nand: Add+use mtd_to/from_nand and nand_get/set_controller_data") the assignment of mtd->priv was removed but was not replaced. This adds the required nand_set_controller_data() call. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- drivers/mtd/nand/pxa3xx_nand.c | 1 + 1 file changed, 1 insertion(+)