diff options
author | Jonas Gorski <jonas.gorski@gmail.com> | 2016-08-09 11:23:32 +0200 |
---|---|---|
committer | Jonas Gorski <jonas.gorski@gmail.com> | 2016-08-13 15:49:35 +0200 |
commit | 0ddae04c226983e1e064d8750b8bb8724f077ad9 (patch) | |
tree | 84f901cf5188629c2bd08d24c9cf743d29f01497 /target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | |
parent | 86ec4104181992400363e5602c11079e79524d9c (diff) | |
download | mtk-20170518-0ddae04c226983e1e064d8750b8bb8724f077ad9.zip mtk-20170518-0ddae04c226983e1e064d8750b8bb8724f077ad9.tar.gz mtk-20170518-0ddae04c226983e1e064d8750b8bb8724f077ad9.tar.bz2 |
brcm63xx: backport mtd of node changes from upstream
Should fix parser data containing uninitialized values for of probed
physmap flashes, which could break e.g. the redboot parser.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch index 4793836..6c26d6c 100644 --- a/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch +++ b/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch @@ -11,13 +11,16 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -251,7 +251,8 @@ static int m25p_probe(struct spi_device +@@ -248,8 +248,10 @@ static int m25p_probe(struct spi_device + if (ret) + return ret; - ppdata.of_node = spi->dev.of_node; - -- return mtd_device_parse_register(&nor->mtd, NULL, &ppdata, +- return mtd_device_register(&nor->mtd, data ? data->parts : NULL, +- data ? data->nr_parts : 0); + return mtd_device_parse_register(&nor->mtd, -+ data ? data->part_probe_types : NULL, &ppdata, - data ? data->parts : NULL, - data ? data->nr_parts : 0); ++ data ? data->part_probe_types : NULL, NULL, ++ data ? data->parts : NULL, ++ data ? data->nr_parts : 0); } + + |