Message ID | 1243333454-673-1-git-send-email-vapier@gentoo.org |
---|---|
State | Accepted |
Commit | 530c3b60658687e2ad7bf98ef83631a8280ae8a6 |
Headers | show |
On Tue, 2009-05-26 at 06:24 -0400, Mike Frysinger wrote: > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > Signed-off-by: Bryan Wu <cooloney@kernel.org> > --- > drivers/mtd/nand/bf5xx_nand.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) I've taken these 2 patches to my l2-mtd-2.6.git.
On Wed, May 27, 2009 at 10:46, Artem Bityutskiy wrote: > On Tue, 2009-05-26 at 06:24 -0400, Mike Frysinger wrote: >> Signed-off-by: Mike Frysinger <vapier@gentoo.org> >> Signed-off-by: Bryan Wu <cooloney@kernel.org> >> --- >> drivers/mtd/nand/bf5xx_nand.c | 4 +--- >> 1 files changed, 1 insertions(+), 3 deletions(-) > > I've taken these 2 patches to my l2-mtd-2.6.git. looks like a typo was made when you rewrote the subject line ? http://git.infradead.org/users/dedekind/l2-mtd-2.6.git?a=commit;h=f6f3799ed7d93bbfef8fc96013a22121580ee233 "NFCr" rather than "NFC" ... -mike
On Mon, 2009-06-01 at 23:57 -0400, Mike Frysinger wrote: > On Wed, May 27, 2009 at 10:46, Artem Bityutskiy wrote: > > On Tue, 2009-05-26 at 06:24 -0400, Mike Frysinger wrote: > >> Signed-off-by: Mike Frysinger <vapier@gentoo.org> > >> Signed-off-by: Bryan Wu <cooloney@kernel.org> > >> --- > >> drivers/mtd/nand/bf5xx_nand.c | 4 +--- > >> 1 files changed, 1 insertions(+), 3 deletions(-) > > > > I've taken these 2 patches to my l2-mtd-2.6.git. > > looks like a typo was made when you rewrote the subject line ? > http://git.infradead.org/users/dedekind/l2-mtd-2.6.git?a=commit;h=f6f3799ed7d93bbfef8fc96013a22121580ee233 > "NFCr" rather than "NFC" ... Let me re-phrase it as "when you amended the subject line for unification purposes". I'll fix that. This tree is anyway throw-away. I'm just being an intelligent patchwork for dwmw2 in this case. :-)
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c index 4c2a67c..2ab42d2 100644 --- a/drivers/mtd/nand/bf5xx_nand.c +++ b/drivers/mtd/nand/bf5xx_nand.c @@ -458,7 +458,7 @@ static irqreturn_t bf5xx_nand_dma_irq(int irq, void *dev_id) return IRQ_HANDLED; } -static int bf5xx_nand_dma_rw(struct mtd_info *mtd, +static void bf5xx_nand_dma_rw(struct mtd_info *mtd, uint8_t *buf, int is_read) { struct bf5xx_nand_info *info = mtd_to_nand_info(mtd); @@ -512,8 +512,6 @@ static int bf5xx_nand_dma_rw(struct mtd_info *mtd, else bfin_write_NFC_PGCTL(0x2); wait_for_completion(&info->dma_completion); - - return 0; } static void bf5xx_nand_dma_read_buf(struct mtd_info *mtd,