From d1b65b33b7a25e48c47632afcb9f741d84e0d018 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 29 Jan 2010 20:59:53 +0000
Subject: [PATCH] --- yaml --- r: 195871 b: refs/heads/master c:
 4d3a8534bdbcf4843fc8ad05c9a81a964fc65237 h: refs/heads/master i:   195869:
 777484569d0448c623830519a04ea0b1a66897f1   195867:
 7a062a422d0afdf771df48fadd4bcf318fd2a8eb   195863:
 a91f61248216589215ffda1b25930f1005f2dc49   195855:
 a9a08c5154b1aaba87ffe87ce21b1aa630603f38   195839:
 bf32a9c78871f37a10dc259706195599f651851a v: v3

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

diff --git a/[refs] b/[refs]
index c8e6643c23cc..b21d8c932cbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b520e412faaaad35641aeedd6059179f9f1b393c
+refs/heads/master: 4d3a8534bdbcf4843fc8ad05c9a81a964fc65237
diff --git a/trunk/drivers/mtd/mtd_blkdevs.c b/trunk/drivers/mtd/mtd_blkdevs.c
index 85a52b3c7698..2f8c202dbd86 100644
--- a/trunk/drivers/mtd/mtd_blkdevs.c
+++ b/trunk/drivers/mtd/mtd_blkdevs.c
@@ -242,9 +242,12 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
 	if (new->devnum == -1)
 		new->devnum = last_devnum+1;
 
-	if ((new->devnum << tr->part_bits) > 256) {
+	/* Check that the device and any partitions will get valid
+	 * minor numbers and that the disk naming code below can cope
+	 * with this number. */
+	if (new->devnum > (MINORMASK >> tr->part_bits) ||
+	    (tr->part_bits && new->devnum >= 27 * 26))
 		return -EBUSY;
-	}
 
 	list_add_tail(&new->list, &tr->devs);
  added: