Merge branch 'fix/ctxfi' into for-linus
* fix/ctxfi: ALSA: ctxfi - Fix uninitialized error checks
This commit is contained in:
commit
f35e2965b2
2 changed files with 9 additions and 12 deletions
|
@ -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,
|
||||||
|
|
||||||
/* 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);
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Reference in a new issue