diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-11-24 18:59:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-11-24 18:59:28 +0000 |
| commit | bb1c915f1e2006ea62f7c9136b18e2491c4303e2 (patch) | |
| tree | 59846f1613df179154ecb266961e3811b373ccba /target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | |
| parent | 18691109df5a590e9914ae73740f145beec847ce (diff) | |
| download | master-31e0f0ae-bb1c915f1e2006ea62f7c9136b18e2491c4303e2.tar.gz master-31e0f0ae-bb1c915f1e2006ea62f7c9136b18e2491c4303e2.tar.bz2 master-31e0f0ae-bb1c915f1e2006ea62f7c9136b18e2491c4303e2.zip | |
kernel: update m25p80 in 4.1 to the latest version from 4.4-rc1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47624
Diffstat (limited to 'target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 e58cd5967b..be62e6789c 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 <jonas.gorski@gmail.com> --- 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); |