kernel: update ssb and bcma to linux-next next-20110628

[openwrt.git] / target / linux / generic / patches-2.6.32 / 066-block2mtd_probe.patch

diff --git a/target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch b/target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
index b2b1a34..b9130a4 100644 (file)
--- a/target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
+++ b/target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
@@ -1,10 +1,16 @@
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
 --- 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();
                /* 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);
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);