From c27564415989fa238016a06e4da79fc66e56b7eb Mon Sep 17 00:00:00 2001
From: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Date: Mon, 14 Feb 2011 16:16:10 +0200
Subject: [PATCH] --- yaml --- r: 242767 b: refs/heads/master c:
 115ee88c15b55859a8b59c5dccb3882bbd47e542 h: refs/heads/master i:   242765:
 02ba5b67c88cb1475799f027a1c151f702413220   242763:
 6cc4dbe6e9dbe21ec730078e5f9a04522230541b   242759:
 53fec9aefed109f9e7d43501d3ec51e9e60a0d1b   242751:
 6eec132a80c3e7dcf5b61b2e0704bb450a4ffdd5 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mtd/mtd_blkdevs.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 554b462f066f..58d6b6378472 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7519dbf6f4b4408229d279d799c938ffdd06f21
+refs/heads/master: 115ee88c15b55859a8b59c5dccb3882bbd47e542
diff --git a/trunk/drivers/mtd/mtd_blkdevs.c b/trunk/drivers/mtd/mtd_blkdevs.c
index e0b5f6442171..650511304030 100644
--- a/trunk/drivers/mtd/mtd_blkdevs.c
+++ b/trunk/drivers/mtd/mtd_blkdevs.c
@@ -405,9 +405,10 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
 	new->rq->queuedata = new;
 	blk_queue_logical_block_size(new->rq, tr->blksize);
 
-	if (tr->discard)
-		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
-					new->rq);
+	if (tr->discard) {
+		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, new->rq);
+		new->rq->limits.max_discard_sectors = UINT_MAX;
+	}
 
 	gd->queue = new->rq;