From bb1c915f1e2006ea62f7c9136b18e2491c4303e2 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 24 Nov 2015 18:59:28 +0000 Subject: kernel: update m25p80 in 4.1 to the latest version from 4.4-rc1 Signed-off-by: Felix Fietkau SVN-Revision: 47624 --- .../202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch') diff --git a/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch index e58cd59..be62e67 100644 --- a/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch +++ b/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch @@ -11,12 +11,12 @@ Signed-off-by: Jonas Gorski --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -234,7 +234,8 @@ static int m25p_probe(struct spi_device +@@ -229,7 +229,8 @@ static int m25p_probe(struct spi_device ppdata.of_node = spi->dev.of_node; -- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata, -+ return mtd_device_parse_register(&flash->mtd, +- return mtd_device_parse_register(&nor->mtd, NULL, &ppdata, ++ return mtd_device_parse_register(&nor->mtd, + data ? data->part_probe_types : NULL, &ppdata, data ? data->parts : NULL, data ? data->nr_parts : 0); -- cgit v1.1