1 files changed, 22 insertions, 13 deletions

diff --git a/kernel/resource.c b/kernel/resource.c
index 73f35d4b30b9..ae246f97c5d3 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -706,24 +706,13 @@ void insert_resource_expand_to_fit(struct resource *root, struct resource *new)
         write_unlock(&resource_lock);
 }
 
-/**
- * adjust_resource - modify a resource's start and size
- * @res: resource to modify
- * @start: new start value
- * @size: new size
- *
- * Given an existing resource, change its start and size to match the
- * arguments.  Returns 0 on success, -EBUSY if it can't fit.
- * Existing children of the resource are assumed to be immutable.
- */
-int adjust_resource(struct resource *res, resource_size_t start, resource_size_t size)
+static int __adjust_resource(struct resource *res, resource_size_t start,
+                                resource_size_t size)
 {
         struct resource *tmp, *parent = res->parent;
         resource_size_t end = start + size - 1;
         int result = -EBUSY;
 
-        write_lock(&resource_lock);
-
         if (!parent)
                 goto skip;
 
@@ -751,6 +740,26 @@ skip:
         result = 0;
 
  out:
+        return result;
+}
+
+/**
+ * adjust_resource - modify a resource's start and size
+ * @res: resource to modify
+ * @start: new start value
+ * @size: new size
+ *
+ * Given an existing resource, change its start and size to match the
+ * arguments.  Returns 0 on success, -EBUSY if it can't fit.
+ * Existing children of the resource are assumed to be immutable.
+ */
+int adjust_resource(struct resource *res, resource_size_t start,
+                        resource_size_t size)
+{
+        int result;
+
+        write_lock(&resource_lock);
+        result = __adjust_resource(res, start, size);
         write_unlock(&resource_lock);
         return result;
 }