diff options
author | Brian Norris <computersforpeace@gmail.com> | 2015-09-30 20:12:14 +0200 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2015-09-30 20:12:14 +0200 |
commit | 0c00a36d93ebeb7b62923d91075c26cf2f63e1bc (patch) | |
tree | c35cdd7728067a487f13d814d61f485d259309c8 /drivers/mtd/nand/mxc_nand.c | |
parent | mtd: nand: vf610_nfc: include missing pincrl/consumer.h (diff) | |
parent | mxc_nand: fix copy_spare (diff) | |
download | linux-0c00a36d93ebeb7b62923d91075c26cf2f63e1bc.tar.xz linux-0c00a36d93ebeb7b62923d91075c26cf2f63e1bc.zip |
Merge MTD 4.3-rc updates into -next
Diffstat (limited to 'drivers/mtd/nand/mxc_nand.c')
-rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index ab281b643725..6862eb3908c3 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -879,7 +879,7 @@ static void copy_spare(struct mtd_info *mtd, bool bfrom) oob_chunk_size); /* the last chunk */ - memcpy16_toio(&s[oob_chunk_size * sparebuf_size], + memcpy16_toio(&s[i * sparebuf_size], &d[i * oob_chunk_size], host->used_oobsize - i * oob_chunk_size); } |