Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Additional updates for 3.6

A batch more bugfixes, all driver-specific and fairly small and
unremarkable in a global context.  The biggest batch are for the newly
added Arizona drivers.

1 files changed, 8 insertions, 1 deletions

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index 42704149b723..58b7d14b08ee 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -206,10 +206,17 @@ static noinline void run_ordered_completions(struct btrfs_workers *workers,
 
                 work->ordered_func(work);
 
-                /* now take the lock again and call the freeing code */
+                /* now take the lock again and drop our item from the list */
                 spin_lock(&workers->order_lock);
                 list_del(&work->order_list);
+                spin_unlock(&workers->order_lock);
+
+                /*
+                 * we don't want to call the ordered free functions
+                 * with the lock held though
+                 */
                 work->ordered_free(work);
+                spin_lock(&workers->order_lock);
         }
 
         spin_unlock(&workers->order_lock);