Merge tag 'v3.18-rc3' into asoc-sgtl5000

Linux 3.18-rc3

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 9cdf62f8accd..c9f2e8c6ccc9 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -203,10 +203,10 @@ void __sg_free_table(struct sg_table *table, unsigned int max_ents,
                 }
 
                 table->orig_nents -= sg_size;
-                if (!skip_first_chunk) {
-                        free_fn(sgl, alloc_size);
+                if (skip_first_chunk)
                         skip_first_chunk = false;
-                }
+                else
+                        free_fn(sgl, alloc_size);
                 sgl = next;
         }