From: Jonas Gorski Date: Tue, 6 Nov 2012 00:48:21 +0000 (+0000) Subject: linux: generic: fix split_squashfs for 3.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0722fd9c63519efbc6da72e21f5eae08254662f4;p=openwrt%2Fstaging%2Fnbd.git 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 --- 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);