diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-10 12:43:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-10 12:43:46 +1000 |
| commit | 55e54fb111789901535f9e042737793be3068725 (patch) | |
| tree | 17f903afb4795aaf8225668153f7a8ff4687541c /sound/pci/ctxfi/ctvmem.c | |
| parent | ddc5a2d4f129068be392e47f66a90eca43d3a2db (diff) | |
| parent | a1510625e80d0c8d066db6a36f124525a92dc3cc (diff) | |
Merge commit 'sound/for-next'
Diffstat (limited to 'sound/pci/ctxfi/ctvmem.c')
| -rw-r--r-- | sound/pci/ctxfi/ctvmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c index 67665a7e43c6..6b78752e9503 100644 --- a/sound/pci/ctxfi/ctvmem.c +++ b/sound/pci/ctxfi/ctvmem.c @@ -60,7 +60,7 @@ get_vm_block(struct ct_vm *vm, unsigned int size) } block = kzalloc(sizeof(*block), GFP_KERNEL); - if (NULL == block) + if (!block) goto out; block->addr = entry->addr; @@ -181,7 +181,7 @@ int ct_vm_create(struct ct_vm **rvm) *rvm = NULL; vm = kzalloc(sizeof(*vm), GFP_KERNEL); - if (NULL == vm) + if (!vm) return -ENOMEM; mutex_init(&vm->lock); @@ -189,7 +189,7 @@ int ct_vm_create(struct ct_vm **rvm) /* Allocate page table pages */ for (i = 0; i < CT_PTP_NUM; i++) { vm->ptp[i] = kmalloc(PAGE_SIZE, GFP_KERNEL); - if (NULL == vm->ptp[i]) + if (!vm->ptp[i]) break; } if (!i) { |