aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-11-06 00:48:21 +0000
committerJonas Gorski <jogo@openwrt.org>2012-11-06 00:48:21 +0000
commit0722fd9c63519efbc6da72e21f5eae08254662f4 (patch)
tree75dcc8fb6ce38979e3ddf7418c6e5d80e091e9d8 /target/linux/generic
parent5bc7d81a20cea223fda501eedcd89ba02d04005c (diff)
downloadupstream-0722fd9c63519efbc6da72e21f5eae08254662f4.tar.gz
upstream-0722fd9c63519efbc6da72e21f5eae08254662f4.tar.bz2
upstream-0722fd9c63519efbc6da72e21f5eae08254662f4.zip
linux: generic: fix split_squashfs for 3.6
_read expects the retlen to be initialized to zero, which the mtd_read helper does. So fix it by using mtd_read instead of calling _read directly. SVN-Revision: 34093
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.6/400-rootfs_split.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.6/400-rootfs_split.patch b/target/linux/generic/patches-3.6/400-rootfs_split.patch
index 976f56002d..8e61f77869 100644
--- a/target/linux/generic/patches-3.6/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.6/400-rootfs_split.patch
@@ -55,7 +55,7 @@
+ struct squashfs_super_block sb;
+ int len, ret;
+
-+ ret = master->_read(master, offset, sizeof(sb), &len, (void *) &sb);
++ ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
+ if (ret || (len != sizeof(sb))) {
+ printk(KERN_ALERT "split_squashfs: error occured while reading "
+ "from \"%s\"\n", master->name);