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
commit06f3165bc20130651c022b916e4020b564219c1d (patch)
treee636f2fa114ec2c22a228af05469942b76442c57 /target/linux/generic
parent3590dfe2a4000bda13874184cc8a003b2074dcf1 (diff)
downloadupstream-06f3165bc20130651c022b916e4020b564219c1d.tar.gz
upstream-06f3165bc20130651c022b916e4020b564219c1d.tar.bz2
upstream-06f3165bc20130651c022b916e4020b564219c1d.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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34093 3c298f89-4303-0410-b956-a3cf2f4a3e73
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);