X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5f33b429e2ec7a5aa0f78cb1d96e22778c6ea5c3..c363de958e3fd2e75e3743d484de8fdaec815294:/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch

diff --git a/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
index 307e5ee34..22b3f5e90 100644
--- a/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
@@ -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;