aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/mtdpart.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 5aac59c21ead..edb90b58a9b1 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -411,11 +411,12 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
411 411
412 /* let's do some sanity checks */ 412 /* let's do some sanity checks */
413 if (slave->offset >= master->size) { 413 if (slave->offset >= master->size) {
414 /* let's register it anyway to preserve ordering */ 414 /* let's register it anyway to preserve ordering */
415 slave->offset = 0; 415 slave->offset = 0;
416 slave->mtd.size = 0; 416 slave->mtd.size = 0;
417 printk(KERN_ERR"mtd: partition \"%s\" is out of reach -- disabled\n", 417 printk(KERN_ERR"mtd: partition \"%s\" is out of reach -- disabled\n",
418 part->name); 418 part->name);
419 goto out_register;
419 } 420 }
420 if (slave->offset + slave->mtd.size > master->size) { 421 if (slave->offset + slave->mtd.size > master->size) {
421 slave->mtd.size = master->size - slave->offset; 422 slave->mtd.size = master->size - slave->offset;
@@ -475,6 +476,7 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
475 } 476 }
476 } 477 }
477 478
479out_register:
478 if (part->mtdp) { 480 if (part->mtdp) {
479 /* store the object pointer (caller may or may not register it*/ 481 /* store the object pointer (caller may or may not register it*/
480 *part->mtdp = &slave->mtd; 482 *part->mtdp = &slave->mtd;