[PATCH 0/3] MTD/maps Blackfin async flash maps fixing and updates

[PATCH 0/3] MTD/maps Blackfin async flash maps fixing and updates

[Bryan Wu]

Hi David,

Please take a look at these 3 updates about Blackfin aync flash maps.
I remember I sent out the first and second patches 2 monthes ago.

Thanks
-Bryan

[PATCH 1/3] mtd/maps: blackfin async flash maps - fix bug: dont leak resources when initializing in case of errors

[Bryan Wu]

From: Mike Frysinger <vapier.adi@gmail.com>

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
 drivers/mtd/maps/bfin-async-flash.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 6fec86a..576611f 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -152,14 +152,18 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
 
 	if (gpio_request(state->enet_flash_pin, DRIVER_NAME)) {
 		pr_devinit(KERN_ERR DRIVER_NAME ": Failed to request gpio %d\n", state->enet_flash_pin);
+		kfree(state);
 		return -EBUSY;
 	}
 	gpio_direction_output(state->enet_flash_pin, 1);
 
 	pr_devinit(KERN_NOTICE DRIVER_NAME ": probing %d-bit flash bus\n", state->map.bankwidth * 8);
 	state->mtd = do_map_probe(memory->name, &state->map);
-	if (!state->mtd)
+	if (!state->mtd) {
+		gpio_free(state->enet_flash_pin);
+		kfree(state);
 		return -ENXIO;
+	}
 
 #ifdef CONFIG_MTD_PARTITIONS
 	ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0);
-- 
1.5.6.3

[PATCH 2/3] mtd/maps: blackfin async flash maps: bfin-async mtd driver needs complex mappings

[Bryan Wu]

From: Mike Frysinger <vapier.adi@gmail.com>

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
 drivers/mtd/maps/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 0225cbb..043d50f 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -491,7 +491,7 @@ config MTD_PCMCIA_ANONYMOUS
 
 config MTD_BFIN_ASYNC
 	tristate "Blackfin BF533-STAMP Flash Chip Support"
-	depends on BFIN533_STAMP && MTD_CFI
+	depends on BFIN533_STAMP && MTD_CFI && MTD_COMPLEX_MAPPINGS
 	select MTD_PARTITIONS
 	default y
 	help
-- 
1.5.6.3

[PATCH 3/3] mtd/maps: blackfin async flash maps: fix up memory leak

[Bryan Wu]

From: Mike Frysinger <vapier.adi@gmail.com>

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
 drivers/mtd/maps/bfin-async-flash.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 576611f..15d11cb 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -170,6 +170,7 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
 	if (ret > 0) {
 		pr_devinit(KERN_NOTICE DRIVER_NAME ": Using commandline partition definition\n");
 		add_mtd_partitions(state->mtd, pdata->parts, ret);
+		kfree(pdata->parts);
 
 	} else if (pdata->nr_parts) {
 		pr_devinit(KERN_NOTICE DRIVER_NAME ": Using board partition definition\n");
-- 
1.5.6.3

Re: [PATCH 2/3] mtd/maps: blackfin async flash maps: bfin-async mtd driver needs complex mappings

[Andrew Morton]

(all three patches were sent to "inux-mtd".  Fixed here).

On Thu,  5 Feb 2009 16:26:50 +0800
Bryan Wu <cooloney@kernel.org> wrote:

> From: Mike Frysinger <vapier.adi@gmail.com>
> 
> Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>

This is an underwhelming changelog.

>  drivers/mtd/maps/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
> index 0225cbb..043d50f 100644
> --- a/drivers/mtd/maps/Kconfig
> +++ b/drivers/mtd/maps/Kconfig
> @@ -491,7 +491,7 @@ config MTD_PCMCIA_ANONYMOUS
>  
>  config MTD_BFIN_ASYNC
>  	tristate "Blackfin BF533-STAMP Flash Chip Support"
> -	depends on BFIN533_STAMP && MTD_CFI
> +	depends on BFIN533_STAMP && MTD_CFI && MTD_COMPLEX_MAPPINGS
>  	select MTD_PARTITIONS
>  	default y
>  	help

I assume this corrects a build error?

Re: [PATCH 2/3] mtd/maps: blackfin async flash maps: bfin-async mtd driver needs complex mappings

[Mike Frysinger]

On Thu, Feb 5, 2009 at 17:02, Andrew Morton wrote:
> On Thu,  5 Feb 2009 16:26:50 +0800 Bryan Wu wrote:
>> From: Mike Frysinger <vapier.adi@gmail.com>
>>
>> Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
>> Signed-off-by: Bryan Wu <cooloney@kernel.org>
>
> This is an underwhelming changelog.
>
>>  drivers/mtd/maps/Kconfig |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
>> index 0225cbb..043d50f 100644
>> --- a/drivers/mtd/maps/Kconfig
>> +++ b/drivers/mtd/maps/Kconfig
>> @@ -491,7 +491,7 @@ config MTD_PCMCIA_ANONYMOUS
>>
>>  config MTD_BFIN_ASYNC
>>       tristate "Blackfin BF533-STAMP Flash Chip Support"
>> -     depends on BFIN533_STAMP && MTD_CFI
>> +     depends on BFIN533_STAMP && MTD_CFI && MTD_COMPLEX_MAPPINGS
>>       select MTD_PARTITIONS
>>       default y
>>       help
>
> I assume this corrects a build error?

yes ... bfin-async uses complex mappings and so needs it
-mike