kernel: revert an upstream linux-stable commit that is causing usb regressions on...

[oweals/openwrt.git] / target / linux / generic / patches-3.9 / 441-block2mtd_refresh.patch

diff --git a/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch b/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch
index 11b743db2ec61c34783840d0680a61f54ee8e5a3..67657443ff59abd7ec8a9be77677aa87f6050055 100644 (file)
--- a/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch
+++ b/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch
@@ -53,8 +53,9 @@
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
 -              if (IS_ERR(page))
+-                      return PTR_ERR(page);
 +              if (IS_ERR(page)) {
-                       return PTR_ERR(page);
++                      err = PTR_ERR(page);
 +                      goto done;
 +              }
  
@@ -230,8 +231,7 @@
 -      bdev = blkdev_get_by_path(devname, mode, dev);
 -#ifndef MODULE
 -      if (IS_ERR(bdev)) {
-+      strcpy(dev->devname, devname);
- 
+-
 -              /* We might not have rootfs mounted at this point. Try
 -                 to resolve the device name by other means. */
 -
@@ -246,7 +246,8 @@
 -              goto devinit_err;
 -      }
 -      dev->blkdev = bdev;
--
++      strcpy(dev->devname, devname);
+ 
 -      if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
 -              ERROR("attempting to use an MTD device as a block device");
 +      if (_open_bdev(dev))