summaryrefslogtreecommitdiff
path: root/lib/scatterlist.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-05 13:12:55 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-05 13:12:55 +0400
commitf3831a592fe4332a70baad64a860b345398885b7 (patch)
treefd27b986295fe5a4f1c0924a804228f829a4c894 /lib/scatterlist.c
parent376f7839b72ec526173cafb5d8eadfc61e2effdf (diff)
parent8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff)
downloadlinux-f3831a592fe4332a70baad64a860b345398885b7.tar.xz
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'lib/scatterlist.c')
-rw-r--r--lib/scatterlist.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index b7b449dafbe5..a295e404e908 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -347,9 +347,12 @@ bool sg_miter_next(struct sg_mapping_iter *miter)
sg_miter_stop(miter);
/* get to the next sg if necessary. __offset is adjusted by stop */
- if (miter->__offset == miter->__sg->length && --miter->__nents) {
- miter->__sg = sg_next(miter->__sg);
- miter->__offset = 0;
+ while (miter->__offset == miter->__sg->length) {
+ if (--miter->__nents) {
+ miter->__sg = sg_next(miter->__sg);
+ miter->__offset = 0;
+ } else
+ return false;
}
/* map the next page */