diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:48 +0200 |
| commit | 6c5cb93b1e87be56d7f00767fd12cf57852a0b9f (patch) | |
| tree | 69fb247d92d1130c2151312d36e1917fcc6b7481 /sound/pci/ctxfi/ctresource.c | |
| parent | Merge branch 'topic/ctl-add-remove-fixes' into for-linus (diff) | |
| parent | ALSA: ctxfi - Simple code clean up (diff) | |
| download | linux-dev-6c5cb93b1e87be56d7f00767fd12cf57852a0b9f.tar.xz linux-dev-6c5cb93b1e87be56d7f00767fd12cf57852a0b9f.zip | |
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi:
ALSA: ctxfi - Simple code clean up
ALSA: ctxfi - Native timer support for emu20k2
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) { |