Skip to content

L
linux-davinci
Commit 89e1b951 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/ctxfi' into topic/ctxfi

parents 9c6c529a 68110661
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 12 deletions
sound/pci/ctxfi/ctamixer.c
View file @ 89e1b951
...@@ -242,13 +242,12 @@ static int get_amixer_rsc(struct amixer_mgr *mgr, ...@@ -242,13 +242,12 @@ static int get_amixer_rsc(struct amixer_mgr *mgr,
/* Allocate mem for amixer resource */ /* Allocate mem for amixer resource */
amixer = kzalloc(sizeof(*amixer), GFP_KERNEL); amixer = kzalloc(sizeof(*amixer), GFP_KERNEL);
if (NULL == amixer) { if (!amixer)
err = -ENOMEM; return -ENOMEM;
return err;
}
/* Check whether there are sufficient /* Check whether there are sufficient
* amixer resources to meet request. */ * amixer resources to meet request. */
err = 0;
spin_lock_irqsave(&mgr->mgr_lock, flags); spin_lock_irqsave(&mgr->mgr_lock, flags);
for (i = 0; i < desc->msr; i++) { for (i = 0; i < desc->msr; i++) {
err = mgr_get_resource(&mgr->mgr, 1, &idx); err = mgr_get_resource(&mgr->mgr, 1, &idx);
...@@ -397,12 +396,11 @@ static int get_sum_rsc(struct sum_mgr *mgr, ...@@ -397,12 +396,11 @@ static int get_sum_rsc(struct sum_mgr *mgr,
/* Allocate mem for sum resource */ /* Allocate mem for sum resource */
sum = kzalloc(sizeof(*sum), GFP_KERNEL); sum = kzalloc(sizeof(*sum), GFP_KERNEL);
if (NULL == sum) { if (!sum)
err = -ENOMEM; return -ENOMEM;
return err;
}
/* Check whether there are sufficient sum resources to meet request. */ /* Check whether there are sufficient sum resources to meet request. */
err = 0;
spin_lock_irqsave(&mgr->mgr_lock, flags); spin_lock_irqsave(&mgr->mgr_lock, flags);
for (i = 0; i < desc->msr; i++) { for (i = 0; i < desc->msr; i++) {
err = mgr_get_resource(&mgr->mgr, 1, &idx); err = mgr_get_resource(&mgr->mgr, 1, &idx);
......
sound/pci/ctxfi/ctsrc.c
View file @ 89e1b951
...@@ -724,12 +724,11 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr, ...@@ -724,12 +724,11 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr,
/* Allocate mem for SRCIMP resource */ /* Allocate mem for SRCIMP resource */
srcimp = kzalloc(sizeof(*srcimp), GFP_KERNEL); srcimp = kzalloc(sizeof(*srcimp), GFP_KERNEL);
if (NULL == srcimp) { if (!srcimp)
err = -ENOMEM; return -ENOMEM;
return err;
}
/* Check whether there are sufficient SRCIMP resources. */ /* Check whether there are sufficient SRCIMP resources. */
err = 0;
spin_lock_irqsave(&mgr->mgr_lock, flags); spin_lock_irqsave(&mgr->mgr_lock, flags);
for (i = 0; i < desc->msr; i++) { for (i = 0; i < desc->msr; i++) {
err = mgr_get_resource(&mgr->mgr, 1, &idx); err = mgr_get_resource(&mgr->mgr, 1, &idx);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment