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/ctresource.c | |
| parent | ddc5a2d4f129068be392e47f66a90eca43d3a2db (diff) | |
| parent | a1510625e80d0c8d066db6a36f124525a92dc3cc (diff) | |
Merge commit 'sound/for-next'
Diffstat (limited to 'sound/pci/ctxfi/ctresource.c')
| -rw-r--r-- | sound/pci/ctxfi/ctresource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c index 889c495bb7d1..7dfaf67344d4 100644 --- a/sound/pci/ctxfi/ctresource.c +++ b/sound/pci/ctxfi/ctresource.c @@ -144,7 +144,7 @@ int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw) rsc->msr = msr; rsc->hw = hw; rsc->ops = &rsc_generic_ops; - if (NULL == hw) { + if (!hw) { rsc->ctrl_blk = NULL; return 0; } @@ -216,7 +216,7 @@ int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type, mgr->type = NUM_RSCTYP; mgr->rscs = kzalloc(((amount + 8 - 1) / 8), GFP_KERNEL); - if (NULL == mgr->rscs) + if (!mgr->rscs) return -ENOMEM; switch (type) { |