domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: generic: fix split_squashfs for 3.6

Browse Source 
_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
This commit is contained in:
Jonas Gorski
2012-11-06 00:48:21 +00:00
parent 5bc7d81a20
commit 0722fd9c63
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/generic/patches-3.6/400-rootfs_split.patch
View File

@@ -55,7 +55,7 @@
+ struct squashfs_super_block sb; + struct squashfs_super_block sb;
+ int len, ret; + 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))) { + if (ret || (len != sizeof(sb))) {
+ printk(KERN_ALERT "split_squashfs: error occured while reading " + printk(KERN_ALERT "split_squashfs: error occured while reading "
+ "from \"%s\"\n", master->name); + "from \"%s\"\n", master->name);