Merge tag 'acpi-part2-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / kernel / async.c

diff --git a/kernel/async.c b/kernel/async.c
index 2cbd3dd5940dea73e2707147cb7a383cbacbec27..a893d6170944f7264c63e1e890420c9ecd0e9855 100644 (file)
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -84,20 +84,24 @@ static atomic_t entry_count;
 
 static async_cookie_t lowest_in_progress(struct async_domain *domain)
 {
-       struct list_head *pending;
+       struct async_entry *first = NULL;
        async_cookie_t ret = ASYNC_COOKIE_MAX;
        unsigned long flags;
 
        spin_lock_irqsave(&async_lock, flags);
 
-       if (domain)
-               pending = &domain->pending;
-       else
-               pending = &async_global_pending;
+       if (domain) {
+               if (!list_empty(&domain->pending))
+                       first = list_first_entry(&domain->pending,
+                                       struct async_entry, domain_list);
+       } else {
+               if (!list_empty(&async_global_pending))
+                       first = list_first_entry(&async_global_pending,
+                                       struct async_entry, global_list);
+       }
 
-       if (!list_empty(pending))
-               ret = list_first_entry(pending, struct async_entry,
-                                      domain_list)->cookie;
+       if (first)
+               ret = first->cookie;
 
        spin_unlock_irqrestore(&async_lock, flags);
        return ret;