FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-29 13:00:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: fireworks: use managed-resource to maintain response buffer

Browse Source 
ALSA fireworks driver allocates memory object to handle response from
target unit. The object is used to initiate transaction unique to
Fireworks board module. This can be released as managed-resource
of 'struct snd_card.card_dev'.

This commit uses managed-resource of the sound card device for this
purpose.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2018-10-03 08:21:52 +09:00 committed by Takashi Iwai
parent a3aaf7d2bd
commit 784fffbcfe
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/firewire/fireworks/fireworks.c
View File

@ -189,8 +189,6 @@ static void efw_free(struct snd_efw *efw)
snd_efw_stream_destroy_duplex(efw); snd_efw_stream_destroy_duplex(efw);
snd_efw_transaction_remove_instance(efw); snd_efw_transaction_remove_instance(efw);
kfree(efw->resp_buf);
mutex_destroy(&efw->mutex); mutex_destroy(&efw->mutex);
fw_unit_put(efw->unit); fw_unit_put(efw->unit);
} }
@ -247,8 +245,9 @@ do_registration(struct work_struct *work)
/* prepare response buffer */ /* prepare response buffer */
snd_efw_resp_buf_size = clamp(snd_efw_resp_buf_size, snd_efw_resp_buf_size = clamp(snd_efw_resp_buf_size,
SND_EFW_RESPONSE_MAXIMUM_BYTES, 4096U); SND_EFW_RESPONSE_MAXIMUM_BYTES, 4096U);
efw->resp_buf = kzalloc(snd_efw_resp_buf_size, GFP_KERNEL); efw->resp_buf = devm_kzalloc(&efw->card->card_dev,
if (efw->resp_buf == NULL) { snd_efw_resp_buf_size, GFP_KERNEL);
if (!efw->resp_buf) {
err = -ENOMEM; err = -ENOMEM;
goto error; goto error;
} }
@ -300,8 +299,6 @@ error:
snd_efw_transaction_remove_instance(efw); snd_efw_transaction_remove_instance(efw);
snd_efw_stream_destroy_duplex(efw); snd_efw_stream_destroy_duplex(efw);
snd_card_free(efw->card); snd_card_free(efw->card);
kfree(efw->resp_buf);
efw->resp_buf = NULL;
dev_info(&efw->unit->device, dev_info(&efw->unit->device,
"Sound card registration failed: %d\n", err); "Sound card registration failed: %d\n", err);
} }