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 | eb573cc84f1e3cf86b95bab720ba99a45abf13b2 (patch) | |
| tree | b9a70f4c86488c7289d2eea5e4759412966648f2 /target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch | |
| parent | 39dd97633fb57b95f053e9e25c145b9a44e1fd6e (diff) | |
| download | master-187ad058-eb573cc84f1e3cf86b95bab720ba99a45abf13b2.tar.gz master-187ad058-eb573cc84f1e3cf86b95bab720ba99a45abf13b2.tar.bz2 master-187ad058-eb573cc84f1e3cf86b95bab720ba99a45abf13b2.zip | |
kernel: update m25p80 in 4.1 to the latest version from 4.4-rc1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47624 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch index bdfa887a89..6a9132032f 100644 --- a/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch +++ b/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch @@ -1,11 +1,11 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -234,7 +234,9 @@ static int m25p_probe(struct spi_device +@@ -229,7 +229,9 @@ 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_probes : NULL, + &ppdata, data ? data->parts : NULL, |