From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 22 May 2009 18:25:34 +0000 (+0200)
Subject: Merge branch 'master' into for-2.6.31
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e4b636366c00738b9609cda307014d71b1225b7f;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

e4b636366c00738b9609cda307014d71b1225b7f
diff --cc drivers/mmc/card/block.c
index 949e99770ad,b25e9b6516a..c5df8654645
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@@ -251,8 -251,16 +251,16 @@@ static int mmc_blk_issue_rq(struct mmc_
  		brq.stop.opcode = MMC_STOP_TRANSMISSION;
  		brq.stop.arg = 0;
  		brq.stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
 -		brq.data.blocks = req->nr_sectors;
 +		brq.data.blocks = blk_rq_sectors(req);
  
+ 		/*
+ 		 * The block layer doesn't support all sector count
+ 		 * restrictions, so we need to be prepared for too big
+ 		 * requests.
+ 		 */
+ 		if (brq.data.blocks > card->host->max_blk_count)
+ 			brq.data.blocks = card->host->max_blk_count;
+ 
  		/*
  		 * After a read error, we redo the request one sector at a time
  		 * in order to accurately determine which sectors can be read