public inbox for linux-mtd@lists.infradead.org
 help / color / mirror / Atom feed
From: Artem Bityutskiy <dedekind@infradead.org>
To: Vladimir Barinov <vova.barinov@gmail.com>
Cc: linux-mtd@lists.infradead.org, dwmw2@infradead.org
Subject: Re: [PATCH] [MTD] MXC NAND driver fixes (v4)
Date: Thu, 23 Apr 2009 09:46:03 +0300	[thread overview]
Message-ID: <1240469163.19218.16.camel@localhost.localdomain> (raw)
In-Reply-To: <1240414310-9245-1-git-send-email-vbarinov@embeddedalley.com>

On Wed, 2009-04-22 at 19:31 +0400, Vladimir Barinov wrote:
> The following patch fixes:
>  - re-initialization of host->col_addr which is used as byte index
>    between the successive READID flash commands.
>  - compile error when CONFIG_PM is enabled
>  - pass on the error code from clk_get()
>  - return -ENOMEM in case of failed ioremap()
>  - pass on the return value of platform_driver_probe() directly
>  - remove excessive printk
>  - let command line partition table parsing with mxc_nand name.
>    The cmd_line parsing is done via <mtd-id> name that differs
>    from mxc_nand by default and looks like "NAND 256MiB 1,8V 8-bit"
> 
> Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com>
> Signed-off-by: Lothar Wassmann <LW@KARO-electronics.de>
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  drivers/mtd/nand/mxc_nand.c |   43 +++++++++++++++++++++++--------------------
>  1 files changed, 23 insertions(+), 20 deletions(-)

Your patch does not apply to the latest mtd-2.6.git

[dedekind@eru l2-mtd-2.6.git]$ git-am vova                                                                                                                                             
Applying: MXC NAND driver fixes (v4)                                                                                                                                                   
error: patch failed: drivers/mtd/nand/mxc_nand.c:866                                                                                                                                   
error: drivers/mtd/nand/mxc_nand.c: patch does not apply                                                                                                                               
Patch failed at 0001.                                                                                                                                                                  
When you have resolved this problem run "git am --resolved".                                                                                                                           
If you would prefer to skip this patch, instead run "git am --skip".                                                                                                                   
To restore the original branch and stop patching run "git am --abort".                                                                                                                 
                                                                                                                                                     
[dedekind@eru l2-mtd-2.6.git]$ patch -p1 < vova                                                                                                                                        
patching file drivers/mtd/nand/mxc_nand.c                                                                                                                                              
Hunk #2 FAILED at 867.                                                                                                                                                                 
Hunk #3 succeeded at 884 (offset 1 line).                                                                                                                                              
Hunk #5 succeeded at 1015 (offset 1 line).                                                                                                                                             
1 out of 6 hunks FAILED -- saving rejects to file drivers/mtd/nand/mxc_nand.c.rej                                                                                                      

[dedekind@eru l2-mtd-2.6.git]$ cat drivers/mtd/nand/mxc_nand.c.rej
***************
*** 866,871 ****
        mtd = &host->mtd;
        mtd->priv = this;
        mtd->owner = THIS_MODULE;

        /* 50 us command delay time */
        this->chip_delay = 5;
--- 867,873 ----
        mtd = &host->mtd;
        mtd->priv = this;
        mtd->owner = THIS_MODULE;
+       mtd->name = "mxc_nand";

        /* 50 us command delay time */
        this->chip_delay = 5;

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

  reply	other threads:[~2009-04-23  6:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-22 15:31 [PATCH] [MTD] MXC NAND driver fixes (v4) Vladimir Barinov
2009-04-23  6:46 ` Artem Bityutskiy [this message]
2009-04-23 11:31   ` Vladimir Barinov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1240469163.19218.16.camel@localhost.localdomain \
    --to=dedekind@infradead.org \
    --cc=dwmw2@infradead.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=vova.barinov@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox