diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
| commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
| tree | bf5f3f18f14855043324ef02a116532d866e3dac /drivers/mtd/nand/mxc_nand.c | |
| parent | ALSA: Remove transfer_ack_{begin,end} callbacks from struct snd_pcm_runtime (diff) | |
| parent | ASoC: cht_bsw_rt5672: Use snd_pcm_hw_constraint_single() (diff) | |
| download | linux-dev-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz linux-dev-274035751e25ee15a064e43cde7b4e7a9b75d921.zip | |
Merge branch 'topic/hw-constraint-single' into for-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 2426db88db36..f04445b992f5 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); } |