Unverified Commit a5486952 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14673 ALSA: 6fire: Release resources at card release 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lin Ruifeng <linruifeng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UVETENSMUK4W2PMNWTKFMJI3KGOC3M64/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAEC 
 
Link:https://gitee.com/openeuler/kernel/pulls/14673

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 9f8392b4 f50b09bd

sound/usb/6fire/chip.c

+5 −5
Original line number Diff line number Diff line
@@ -61,8 +61,10 @@ static void usb6fire_chip_abort(struct sfire_chip *chip) 
	}

}



static void usb6fire_chip_destroy(struct sfire_chip *chip)

static void usb6fire_card_free(struct snd_card *card)

{

	struct sfire_chip *chip = card->private_data;



	if (chip) {

		if (chip->pcm)

			usb6fire_pcm_destroy(chip);
@@ -72,8 +74,6 @@ static void usb6fire_chip_destroy(struct sfire_chip *chip) 
			usb6fire_comm_destroy(chip);

		if (chip->control)

			usb6fire_control_destroy(chip);

		if (chip->card)

			snd_card_free(chip->card);

	}

}
@@ -136,6 +136,7 @@ static int usb6fire_chip_probe(struct usb_interface *intf, 
	chip->regidx = regidx;

	chip->intf_count = 1;

	chip->card = card;

	card->private_free = usb6fire_card_free;



	ret = usb6fire_comm_init(chip);

	if (ret < 0)
@@ -162,7 +163,7 @@ static int usb6fire_chip_probe(struct usb_interface *intf, 
	return 0;



destroy_chip:

	usb6fire_chip_destroy(chip);

	snd_card_free(card);

	return ret;

}
@@ -181,7 +182,6 @@ static void usb6fire_chip_disconnect(struct usb_interface *intf) 


			chip->shutdown = true;

			usb6fire_chip_abort(chip);

			usb6fire_chip_destroy(chip);

		}

	}

}