Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 7 deletions

diff --git a/kernel/async.c b/kernel/async.c
index 968ef9457d4e..27235f5de198 100644
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -92,19 +92,18 @@ extern int initcall_debug;
 static async_cookie_t  __lowest_in_progress(struct list_head *running)
 {
         struct async_entry *entry;
+
         if (!list_empty(running)) {
                 entry = list_first_entry(running,
                         struct async_entry, list);
                 return entry->cookie;
-        } else if (!list_empty(&async_pending)) {
-                entry = list_first_entry(&async_pending,
-                        struct async_entry, list);
-                return entry->cookie;
-        } else {
-                /* nothing in progress... next_cookie is "infinity" */
-                return next_cookie;
         }
 
+        list_for_each_entry(entry, &async_pending, list)
+                if (entry->running == running)
+                        return entry->cookie;
+
+        return next_cookie;     /* "infinity" value */
 }
 
 static async_cookie_t  lowest_in_progress(struct list_head *running)