| Message ID | 1282974300-11664-1-git-send-email-vapier@gentoo.org |
|---|---|
| State | Accepted, archived |
| Commit | eac15a429a27cb74115daaf4c1127c5e854d50e4 |
| Headers | show |
On Sat, 2010-08-28 at 01:45 -0400, Mike Frysinger wrote: > Seems some patches got out sync when being merged. The Blackfin NFC > driver was updated to use nand_scan_ident(), but it missed the change > where nand_scan_ident() now takes 3 arguments. So update this driver > to fix build failures. > > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > --- > note: this needs to be merged before 2.6.36 final > > drivers/mtd/nand/bf5xx_nand.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c > index a382e3d..162c5ea 100644 > --- a/drivers/mtd/nand/bf5xx_nand.c > +++ b/drivers/mtd/nand/bf5xx_nand.c > @@ -710,7 +710,7 @@ static int bf5xx_nand_scan(struct mtd_info *mtd) > struct nand_chip *chip = mtd->priv; > int ret; > > - ret = nand_scan_ident(mtd, 1); > + ret = nand_scan_ident(mtd, 1, NULL); > if (ret) > return ret; Pushed to l2-mtd-2.6.git / master so far, but please, bug dwmw2 about 2.6.36 inclusion, I'll do this as well, though.
stable team: could you pick this up for 2.6.35.x ? it has been merged in mainline as eac15a429a27cb74115daaf4c1127c5e854d50e4 -mike
On Sat, Oct 16, 2010 at 05:14:53AM -0400, Mike Frysinger wrote: > stable team: could you pick this up for 2.6.35.x ? > > it has been merged in mainline as eac15a429a27cb74115daaf4c1127c5e854d50e4 But it doesn't apply at all to .35-stable. There is no call to nand_scan_ident() in that file in the .35 tree. So, no, sorry, I can't apply it :) thanks, greg k-h
On Fri, Oct 22, 2010 at 11:54, Greg KH wrote: > On Sat, Oct 16, 2010 at 05:14:53AM -0400, Mike Frysinger wrote: >> stable team: could you pick this up for 2.6.35.x ? >> >> it has been merged in mainline as eac15a429a27cb74115daaf4c1127c5e854d50e4 > > But it doesn't apply at all to .35-stable. There is no call to > nand_scan_ident() in that file in the .35 tree. > > So, no, sorry, I can't apply it :) then the patch shouldnt be necessary and 2.6.35.x is OK. sorry for the noise. -mike
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c index a382e3d..162c5ea 100644 --- a/drivers/mtd/nand/bf5xx_nand.c +++ b/drivers/mtd/nand/bf5xx_nand.c @@ -710,7 +710,7 @@ static int bf5xx_nand_scan(struct mtd_info *mtd) struct nand_chip *chip = mtd->priv; int ret; - ret = nand_scan_ident(mtd, 1); + ret = nand_scan_ident(mtd, 1, NULL); if (ret) return ret;
Seems some patches got out sync when being merged. The Blackfin NFC driver was updated to use nand_scan_ident(), but it missed the change where nand_scan_ident() now takes 3 arguments. So update this driver to fix build failures. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- note: this needs to be merged before 2.6.36 final drivers/mtd/nand/bf5xx_nand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)