X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c3fd35e7800ae1f2dd3fa42ade850c948e4b18ea..347c600521d2864d728e192cff1c1124d54b23ea:/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch?ds=inline

diff --git a/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
index a642dee2a..7956baf9b 100644
--- a/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
@@ -207,7 +207,7 @@
 +			if (ROOT_DEV == 0) {
 +				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
 +					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, i);
++				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
 +			}
 +#endif
 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
@@ -434,7 +434,7 @@
  		if (devt) {
  			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
  		}
-@@ -263,17 +276,97 @@ static struct block2mtd_dev *add_device(
+@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
  #endif
  
  	if (IS_ERR(bdev)) {
@@ -498,9 +498,10 @@
 +	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
 +	if (!bdev || !bdev->bd_disk)
 +		err = -EINVAL;
-+	else {
++#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
++	else
 +		err = rescan_partitions(bdev->bd_disk, bdev);
-+	}
++#endif
 +	if (bdev)
 +		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
 +
@@ -535,7 +536,7 @@
  
  	if (!mtdname)
  		mtdname = devname;
-@@ -297,6 +390,7 @@ static struct block2mtd_dev *add_device(
+@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
  	dev->mtd.read = block2mtd_read;
  	dev->mtd.priv = dev;
  	dev->mtd.owner = THIS_MODULE;