From b72477f40fa12f9acb5ec67665e76d936913af61 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 13 Nov 2011 19:58:09 +0100
Subject: [PATCH] --- yaml --- r: 275565 b: refs/heads/master c:
 6b76106d8ef31111d6fc469564b83b5f5542794f h: refs/heads/master i:   275563:
 bb3fd4af6d99a26b8b56f27fcc16d404d0cda788 v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-map.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7bbbf7dae0f7..9e743f7639f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 193733585692301f38d489b8ad8724c2f88349c0
+refs/heads/master: 6b76106d8ef31111d6fc469564b83b5f5542794f
diff --git a/trunk/block/blk-map.c b/trunk/block/blk-map.c
index e663ac2d8e68..164cd0059706 100644
--- a/trunk/block/blk-map.c
+++ b/trunk/block/blk-map.c
@@ -204,10 +204,11 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
 		if (!iov[i].iov_len)
 			return -EINVAL;
 
-		if (uaddr & queue_dma_alignment(q)) {
+		/*
+		 * Keep going so we check length of all segments
+		 */
+		if (uaddr & queue_dma_alignment(q))
 			unaligned = 1;
-			break;
-		}
 	}
 
 	if (unaligned || (q->dma_pad_mask & len) || map_data)