diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-22 19:06:53 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-22 19:06:53 +0400 |
| commit | 89e1b9511fc7fbfac4139fca5531f5f9d946c537 (patch) | |
| tree | ddd770fe678f1885a7a89d7d7e1bba7135c3ae3b | |
| parent | 9c6c529a21cd3b6efb367256a239eec4153721c0 (diff) | |
| parent | 68110661e86868cd107955ec7c077e1f34519f78 (diff) | |
| download | linux-89e1b9511fc7fbfac4139fca5531f5f9d946c537.tar.xz | |
Merge branch 'fix/ctxfi' into topic/ctxfi
| -rw-r--r-- | sound/pci/ctxfi/ctamixer.c | 14 | ||||
| -rw-r--r-- | sound/pci/ctxfi/ctsrc.c | 7 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c index a1db51b3ead8..a7f4a671f7b7 100644 --- a/sound/pci/ctxfi/ctamixer.c +++ b/sound/pci/ctxfi/ctamixer.c @@ -242,13 +242,12 @@ static int get_amixer_rsc(struct amixer_mgr *mgr, /* Allocate mem for amixer resource */ amixer = kzalloc(sizeof(*amixer), GFP_KERNEL); - if (NULL == amixer) { - err = -ENOMEM; - return err; - } + if (!amixer) + return -ENOMEM; /* Check whether there are sufficient * amixer resources to meet request. */ + err = 0; spin_lock_irqsave(&mgr->mgr_lock, flags); for (i = 0; i < desc->msr; i++) { err = mgr_get_resource(&mgr->mgr, 1, &idx); @@ -397,12 +396,11 @@ static int get_sum_rsc(struct sum_mgr *mgr, /* Allocate mem for sum resource */ sum = kzalloc(sizeof(*sum), GFP_KERNEL); - if (NULL == sum) { - err = -ENOMEM; - return err; - } + if (!sum) + return -ENOMEM; /* Check whether there are sufficient sum resources to meet request. */ + err = 0; spin_lock_irqsave(&mgr->mgr_lock, flags); for (i = 0; i < desc->msr; i++) { err = mgr_get_resource(&mgr->mgr, 1, &idx); diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c index e1c145d8b702..df43a5cd3938 100644 --- a/sound/pci/ctxfi/ctsrc.c +++ b/sound/pci/ctxfi/ctsrc.c @@ -724,12 +724,11 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr, /* Allocate mem for SRCIMP resource */ srcimp = kzalloc(sizeof(*srcimp), GFP_KERNEL); - if (NULL == srcimp) { - err = -ENOMEM; - return err; - } + if (!srcimp) + return -ENOMEM; /* Check whether there are sufficient SRCIMP resources. */ + err = 0; spin_lock_irqsave(&mgr->mgr_lock, flags); for (i = 0; i < desc->msr; i++) { err = mgr_get_resource(&mgr->mgr, 1, &idx); |