* [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change
@ 2010-08-28 5:45 Mike Frysinger
2010-08-30 12:56 ` Artem Bityutskiy
2010-10-16 9:14 ` [Uclinux-dist-devel] " Mike Frysinger
0 siblings, 2 replies; 5+ messages in thread
From: Mike Frysinger @ 2010-08-28 5:45 UTC (permalink / raw)
To: linux-mtd, David Woodhouse; +Cc: uclinux-dist-devel, Andrew Morton
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;
--
1.7.2.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change
2010-08-28 5:45 [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change Mike Frysinger
@ 2010-08-30 12:56 ` Artem Bityutskiy
2010-10-16 9:14 ` [Uclinux-dist-devel] " Mike Frysinger
1 sibling, 0 replies; 5+ messages in thread
From: Artem Bityutskiy @ 2010-08-30 12:56 UTC (permalink / raw)
To: Mike Frysinger
Cc: David Woodhouse, Andrew Morton, linux-mtd, uclinux-dist-devel
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.
--
Best Regards,
Artem Bityutskiy (Битюцкий Артём)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Uclinux-dist-devel] [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change
2010-08-28 5:45 [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change Mike Frysinger
2010-08-30 12:56 ` Artem Bityutskiy
@ 2010-10-16 9:14 ` Mike Frysinger
2010-10-22 15:54 ` [stable] " Greg KH
1 sibling, 1 reply; 5+ messages in thread
From: Mike Frysinger @ 2010-10-16 9:14 UTC (permalink / raw)
To: stable; +Cc: uclinux-dist-devel, linux-mtd
stable team: could you pick this up for 2.6.35.x ?
it has been merged in mainline as eac15a429a27cb74115daaf4c1127c5e854d50e4
-mike
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [stable] [Uclinux-dist-devel] [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change
2010-10-16 9:14 ` [Uclinux-dist-devel] " Mike Frysinger
@ 2010-10-22 15:54 ` Greg KH
2010-10-22 19:42 ` [Uclinux-dist-devel] [stable] " Mike Frysinger
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2010-10-22 15:54 UTC (permalink / raw)
To: Mike Frysinger; +Cc: uclinux-dist-devel, linux-mtd, stable
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Uclinux-dist-devel] [stable] [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change
2010-10-22 15:54 ` [stable] " Greg KH
@ 2010-10-22 19:42 ` Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2010-10-22 19:42 UTC (permalink / raw)
To: Greg KH; +Cc: uclinux-dist-devel, linux-mtd, stable
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-10-22 19:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-28 5:45 [PATCH] mtd: Blackfin NFC: fix build error after nand_scan_ident() change Mike Frysinger
2010-08-30 12:56 ` Artem Bityutskiy
2010-10-16 9:14 ` [Uclinux-dist-devel] " Mike Frysinger
2010-10-22 15:54 ` [stable] " Greg KH
2010-10-22 19:42 ` [Uclinux-dist-devel] [stable] " Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).