X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=blobdiff_plain;f=drivers%2Fblock%2Fll_rw_blk.c;h=60e64091de1b34df8b5a0cd27c9a952b6b33ac86;hp=fc86d53fe783765c9e7c6bd77a72cd01ddbf4c6d;hb=dfa1a55335a0e822b36607d25c980c4e2a8e5e87;hpb=672c3fd9069e5a138f9d4afc9aeb5aa34aacce32

diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index fc86d53fe78..60e64091de1 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -1344,8 +1344,8 @@ static int ll_front_merge_fn(request_queue_t *q, struct request *req,
 static int ll_merge_requests_fn(request_queue_t *q, struct request *req,
 				struct request *next)
 {
-	int total_phys_segments = req->nr_phys_segments +next->nr_phys_segments;
-	int total_hw_segments = req->nr_hw_segments + next->nr_hw_segments;
+	int total_phys_segments;
+	int total_hw_segments;
 
 	/*
 	 * First check if the either of the requests are re-queued
@@ -1355,7 +1355,7 @@ static int ll_merge_requests_fn(request_queue_t *q, struct request *req,
 		return 0;
 
 	/*
-	 * Will it become to large?
+	 * Will it become too large?
 	 */
 	if ((req->nr_sectors + next->nr_sectors) > q->max_sectors)
 		return 0;