diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-09-25 14:10:29 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-09-25 14:10:29 +0000 |
commit | 0fb8652dd28c833146068a56c78b959fb39d0b54 (patch) | |
tree | 2b4b652c21bd33bccd85a78e591dcf3264f17b09 | |
parent | 2f69a934b79687870e80440d8e443eb388213b2b (diff) | |
download | upstream-0fb8652dd28c833146068a56c78b959fb39d0b54.tar.gz upstream-0fb8652dd28c833146068a56c78b959fb39d0b54.tar.bz2 upstream-0fb8652dd28c833146068a56c78b959fb39d0b54.zip |
kernel: if block2mtd does not find the device immediately, use wait_for_device_probe() before trying again (should fix squashfs/jffs2 image boot issues), patch from #5216
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17720 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/066-block2mtd_probe.patch | 10 | ||||
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.30/066-block2mtd_probe.patch new file mode 100644 index 0000000000..3a42f35fb8 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/066-block2mtd_probe.patch @@ -0,0 +1,10 @@ +--- a/drivers/mtd/devices/block2mtd.c ++++ b/drivers/mtd/devices/block2mtd.c +@@ -268,6 +268,7 @@ + /* We might not have rootfs mounted at this point. Try + to resolve the device name by other means. */ + ++ wait_for_device_probe(); + dev_t devt = name_to_dev_t(dev->devname); + if (devt) { + bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); diff --git a/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch new file mode 100644 index 0000000000..3a42f35fb8 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch @@ -0,0 +1,10 @@ +--- a/drivers/mtd/devices/block2mtd.c ++++ b/drivers/mtd/devices/block2mtd.c +@@ -268,6 +268,7 @@ + /* We might not have rootfs mounted at this point. Try + to resolve the device name by other means. */ + ++ wait_for_device_probe(); + dev_t devt = name_to_dev_t(dev->devname); + if (devt) { + bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); |