1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:30:37 +02:00

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
This commit is contained in:
jogo 2012-11-06 00:48:21 +00:00
parent efe94bf411
commit ab0f1978a2

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);