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)