diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
| commit | 127e4ebd32d51070fd5763e4d50aba211b02de6a (patch) | |
| tree | 510a31b05cfa6ae4477fd738371cc12d3df27853 /target/linux/generic/patches-2.6.39/067-block2mtd_2.6.38_fix.patch | |
| parent | 512bb389ee6125135c6da818686f98774191b457 (diff) | |
| download | upstream-127e4ebd32d51070fd5763e4d50aba211b02de6a.tar.gz upstream-127e4ebd32d51070fd5763e4d50aba211b02de6a.tar.bz2 upstream-127e4ebd32d51070fd5763e4d50aba211b02de6a.zip | |
generic: Add support for 2.6.39
Add support for 2.6.39 based on rc3. Runtime tested on bcm63xx.
SVN-Revision: 26615
Diffstat (limited to 'target/linux/generic/patches-2.6.39/067-block2mtd_2.6.38_fix.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/067-block2mtd_2.6.38_fix.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/067-block2mtd_2.6.38_fix.patch b/target/linux/generic/patches-2.6.39/067-block2mtd_2.6.38_fix.patch new file mode 100644 index 0000000000..1a052b3f43 --- /dev/null +++ b/target/linux/generic/patches-2.6.39/067-block2mtd_2.6.38_fix.patch @@ -0,0 +1,35 @@ +--- a/drivers/mtd/devices/block2mtd.c ++++ b/drivers/mtd/devices/block2mtd.c +@@ -264,12 +264,13 @@ static int _open_bdev(struct block2mtd_d + bdev = blkdev_get_by_path(dev->devname, mode, dev); + #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); ++ devt = name_to_dev_t(dev->devname); + if (devt) + bdev = blkdev_get_by_dev(devt, mode, dev); + } +@@ -330,7 +331,7 @@ static int block2mtd_refresh(struct mtd_ + _close_bdev(dev); + + /* open the whole disk, issue a partition rescan, then */ +- bdev = blkdev_get_by_dev(devt, FMODE_WRITE | FMODE_READ); ++ bdev = blkdev_get_by_dev(devt, FMODE_WRITE | FMODE_READ, mtd); + if (!bdev || !bdev->bd_disk) + err = -EINVAL; + #ifndef CONFIG_MTD_BLOCK2MTD_MODULE +@@ -395,7 +396,7 @@ static struct block2mtd_dev *add_device( + dev->mtd.refresh_device = block2mtd_refresh; + + part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); +- part->name = dev->mtd.name; ++ part->name = name; + part->offset = 0; + part->size = dev->mtd.size; + if (add_mtd_partitions(&dev->mtd, part, 1)) { |