Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index 77bf11a86c7d27ffde2d0cf3545d0110937a5a02..3f285dce9347191537b8d13f8db53f869d4744ad 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -449,7 +449,6 @@ static int __find_resource(struct resource *root, struct resource *old,
        struct resource *this = root->child;
        struct resource tmp = *new, avail, alloc;
 
-       tmp.flags = new->flags;
        tmp.start = root->start;
        /*
         * Skip past an allocated resource that starts at 0, since the assignment