Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89e1b951 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/ctxfi' into topic/ctxfi

parents 9c6c529a 68110661

sound/pci/ctxfi/ctamixer.c

+6 −8
Original line number Diff line number Diff line
@@ -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);

sound/pci/ctxfi/ctsrc.c

+3 −4
Original line number Diff line number Diff line
@@ -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);