summaryrefslogtreecommitdiff
path: root/lib/scatterlist.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-27 12:40:51 +0100
committerTakashi Iwai <tiwai@suse.de>2014-11-27 12:40:51 +0100
commitacf403ecc4155153e5e2c1640be90fc166e56ba7 (patch)
treee9655b84776cec00a4da077f5dd1e336dfd9c7c0 /lib/scatterlist.c
parent69eba10e606a80665f8573221fec589430d9d1cb (diff)
parentb61f90eac1ff9d1b30497e611aba4651d4066706 (diff)
Merge branch 'topic/usb-resume' into for-next
Merge the proper mixer resume support for quirk codes.
Diffstat (limited to 'lib/scatterlist.c')
-rw-r--r--lib/scatterlist.c6
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;
}