043edd8074
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37832
23 lines
898 B
Diff
23 lines
898 B
Diff
From c7c3c338cb25d7f55ddb3f6bfbf3572758ca3896 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Thu, 10 Nov 2011 16:53:08 +0100
|
|
Subject: [PATCH 50/79] MTD: DEVICES: m25p80: use parsers if provided in flash
|
|
platform data
|
|
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
---
|
|
drivers/mtd/devices/m25p80.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mtd/devices/m25p80.c
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
|
@@ -1088,7 +1088,8 @@ static int m25p_probe(struct spi_device
|
|
/* partitions should match sector boundaries; and it may be good to
|
|
* use readonly partitions for writeprotected sectors (BP2..BP0).
|
|
*/
|
|
- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
|
|
+ return mtd_device_parse_register(&flash->mtd,
|
|
+ data ? data->part_probe_types : NULL, &ppdata,
|
|
data ? data->parts : NULL,
|
|
data ? data->nr_parts : 0);
|
|
}
|