Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 927cbd115e53..df7dd08d4391 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -101,6 +101,11 @@ void proc_device_tree_update_prop(struct proc_dir_entry *pde,
 {
         struct proc_dir_entry *ent;
 
+        if (!oldprop) {
+                proc_device_tree_add_prop(pde, newprop);
+                return;
+        }
+
         for (ent = pde->subdir; ent != NULL; ent = ent->next)
                 if (ent->data == oldprop)
                         break;