diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-23 07:34:54 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-23 07:34:54 +0100 |
| commit | 02e2407858fd62053bf60349c0e72cd1c7a4a60e (patch) | |
| tree | 0ebdbddc97d3abbc675916010e7771065b70c137 /sound/pci/ctxfi/ctvmem.c | |
| parent | Merge branch 'battery-sysfs-notifier' into release (diff) | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy... (diff) | |
| download | linux-02e2407858fd62053bf60349c0e72cd1c7a4a60e.tar.xz linux-02e2407858fd62053bf60349c0e72cd1c7a4a60e.zip | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'sound/pci/ctxfi/ctvmem.c')
| -rw-r--r-- | sound/pci/ctxfi/ctvmem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c index 65da6e466f80..b78f3fc3c33c 100644 --- a/sound/pci/ctxfi/ctvmem.c +++ b/sound/pci/ctxfi/ctvmem.c @@ -52,8 +52,7 @@ get_vm_block(struct ct_vm *vm, unsigned int size) if (entry->size == size) { /* Move the vm node from unused list to used list directly */ - list_del(&entry->list); - list_add(&entry->list, &vm->used); + list_move(&entry->list, &vm->used); vm->size -= size; block = entry; goto out; |