diff mbox

mtd: pxa2xx-flash.c: It used to fall back to provided table.

Message ID 1321031180-6153-2-git-send-email-jic23@kernel.org
State Accepted
Commit 7148b7999277e2794cec90d8cb47d2a238e0bd0d
Headers show

Commit Message

Jonathan Cameron Nov. 11, 2011, 5:06 p.m. UTC 
From: Jonathan Cameron <jic23@cam.ac.uk>

Make this work again.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
 drivers/mtd/maps/pxa2xx-flash.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Dmitry Baryshkov Nov. 11, 2011, 10:40 p.m. UTC | #1 
On Fri, Nov 11, 2011 at 9:06 PM, Jonathan Cameron <jic23@kernel.org> wrote:
> From: Jonathan Cameron <jic23@cam.ac.uk>
>
> Make this work again.

My fault.
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

>
> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
>  drivers/mtd/maps/pxa2xx-flash.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
> index 411a17d..2a25b67 100644
> --- a/drivers/mtd/maps/pxa2xx-flash.c
> +++ b/drivers/mtd/maps/pxa2xx-flash.c
> @@ -98,7 +98,7 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
>        }
>        info->mtd->owner = THIS_MODULE;
>
> -       mtd_device_parse_register(info->mtd, probes, 0, NULL, 0);
> +       mtd_device_parse_register(info->mtd, probes, 0, flash->parts, flash->nr_parts);
>
>        platform_set_drvdata(pdev, info);
>        return 0;
> --
> 1.7.7.2
>
>
Artem Bityutskiy Nov. 17, 2011, 9:54 p.m. UTC | #2 
On Fri, 2011-11-11 at 17:06 +0000, Jonathan Cameron wrote:
> From: Jonathan Cameron <jic23@cam.ac.uk>
> 
> Make this work again.
> 
> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>

Pushed to l2-mtd-2.6.git, thanks!

Artem.
Artem Bityutskiy Dec. 6, 2011, 9:06 p.m. UTC | #3 
On Fri, 2011-11-11 at 17:06 +0000, Jonathan Cameron wrote:
> From: Jonathan Cameron <jic23@cam.ac.uk>
> 
> Make this work again.
> 
> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>

I guess this should be sent to Linus this merge window. David?
diff mbox

Patch

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 411a17d..2a25b67 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -98,7 +98,7 @@  static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
 	}
 	info->mtd->owner = THIS_MODULE;
 
-	mtd_device_parse_register(info->mtd, probes, 0, NULL, 0);
+	mtd_device_parse_register(info->mtd, probes, 0, flash->parts, flash->nr_parts);
 
 	platform_set_drvdata(pdev, info);
 	return 0;