projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.9 to 4.9.206
[openwrt/staging/mkresin.git]
/
target
/
linux
/
generic
/
backport-4.9
/
065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch
diff --git
a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch
b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch
index 0d3e10ac201eec9c5be1ba59510a07c9dc4c7bda..578e59a8a1ecc723c147087ea4824e7e0f45888a 100644
(file)
--- a/
target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch
+++ b/
target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch
@@
-31,7
+31,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
&parent->dev :
parent->dev.parent;
slave->mtd.dev.of_node = part->of_node;
&parent->dev :
parent->dev.parent;
slave->mtd.dev.of_node = part->of_node;
-@@ -6
64,8 +664
,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition);
+@@ -6
75,8 +675
,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition);
*/
static int __mtd_del_partition(struct mtd_part *priv)
{
*/
static int __mtd_del_partition(struct mtd_part *priv)
{
@@
-49,7
+49,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs);
err = del_mtd_device(&priv->mtd);
sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs);
err = del_mtd_device(&priv->mtd);
-@@ -6
80,16 +689
,16 @@ static int __mtd_del_partition(struct mt
+@@ -6
91,16 +700
,16 @@ static int __mtd_del_partition(struct mt
/*
* This function unregisters and destroy all slave MTD objects which are
/*
* This function unregisters and destroy all slave MTD objects which are
@@
-69,7
+69,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
ret = __mtd_del_partition(slave);
if (ret < 0)
err = ret;
ret = __mtd_del_partition(slave);
if (ret < 0)
err = ret;
-@@ -
699,14 +708
,14 @@ int del_mtd_partitions(struct mtd_info *
+@@ -
710,14 +719
,14 @@ int del_mtd_partitions(struct mtd_info *
return err;
}
return err;
}
@@
-86,7
+86,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
(slave->mtd.index == partno)) {
ret = __mtd_del_partition(slave);
break;
(slave->mtd.index == partno)) {
ret = __mtd_del_partition(slave);
break;
-@@ -9
39,6 +948
,6 @@ uint64_t mtd_get_device_size(const struc
+@@ -9
64,6 +973
,6 @@ uint64_t mtd_get_device_size(const struc
if (!mtd_is_partition(mtd))
return mtd->size;
if (!mtd_is_partition(mtd))
return mtd->size;