diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
commit | 38f0ad7c90c2b2091e7d8689dde294fef27db68b (patch) | |
tree | 17742c032f74a953054a99ebc04ee6cd7ead2d9d /arch/s390/mm/mem_detect.c | |
parent | 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced (diff) | |
parent | 70a9f8797ce298544cfd07328ff59f00488bc491 (diff) | |
download | op-kernel-dev-38f0ad7c90c2b2091e7d8689dde294fef27db68b.zip op-kernel-dev-38f0ad7c90c2b2091e7d8689dde294fef27db68b.tar.gz |
Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small fixes, all driver specific. The removal of the GPIO based
pinmuxing is a bug fix, since the obsolete nodes had been removed from
the DT it stopped the driver loading.
Diffstat (limited to 'arch/s390/mm/mem_detect.c')
-rw-r--r-- | arch/s390/mm/mem_detect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/mm/mem_detect.c b/arch/s390/mm/mem_detect.c index 3cbd3b8..cca3882 100644 --- a/arch/s390/mm/mem_detect.c +++ b/arch/s390/mm/mem_detect.c @@ -123,7 +123,8 @@ void create_mem_hole(struct mem_chunk mem_chunk[], unsigned long addr, continue; } else if ((addr <= chunk->addr) && (addr + size >= chunk->addr + chunk->size)) { - memset(chunk, 0 , sizeof(*chunk)); + memmove(chunk, chunk + 1, (MEMORY_CHUNKS-i-1) * sizeof(*chunk)); + memset(&mem_chunk[MEMORY_CHUNKS-1], 0, sizeof(*chunk)); } else if (addr + size < chunk->addr + chunk->size) { chunk->size = chunk->addr + chunk->size - addr - size; chunk->addr = addr + size; |