X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-2.6.37%2F442-block2mtd_probe.patch;fp=target%2Flinux%2Fgeneric%2Fpatches-2.6.37%2F442-block2mtd_probe.patch;h=b9130a446c70c80934f765f3542c116a61f10982;hb=75737b895b32d6d3dd16eb672e3b7c622d19f63a;hp=b2b1a347f46a54240e8ad0430f8fda60f6db070b;hpb=0b0ad9dcd4f166515fd68b6493586e6f46279191;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch b/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch index b2b1a347f4..b9130a446c 100644 --- a/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch +++ b/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch @@ -1,10 +1,16 @@ --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c -@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d +@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d + bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL); + #ifndef MODULE + if (IS_ERR(bdev)) { ++ dev_t devt; + /* 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); +- dev_t devt = name_to_dev_t(dev->devname); ++ devt = name_to_dev_t(dev->devname); if (devt) { bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);