git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-18 03:23:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

firewire: ohci: use cleanup helper for isoc context header allocation

Browse Source 
Some cleanup helpers are useful in error path after memory allocation for
header storage.

Link: https://lore.kernel.org/r/20260117142823.440811-5-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
This commit is contained in:
Takashi Sakamoto
2026-01-17 23:28:17 +09:00
parent c544c82989
commit ea6fdb1cbd
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/firewire/ohci.c
View File

@@ -2958,6 +2958,7 @@ static struct fw_iso_context *ohci_allocate_iso_context(struct fw_card *card,
int type, int channel, size_t header_size)
{
struct fw_ohci *ohci = fw_ohci(card);
void *header __free(free_page) = NULL;
struct iso_context *ctx;
descriptor_callback_t callback;
u64 *channels;
@@ -3015,8 +3016,8 @@ static struct fw_iso_context *ohci_allocate_iso_context(struct fw_card *card,
if (type != FW_ISO_CONTEXT_RECEIVE_MULTICHANNEL) {
ctx->sc.header_length = 0;
ctx->sc.header = (void *) __get_free_page(GFP_KERNEL);
if (!ctx->sc.header) {
header = (void *) __get_free_page(GFP_KERNEL);
if (!header) {
ret = -ENOMEM;
goto out;
}
@@ -3024,21 +3025,17 @@ static struct fw_iso_context *ohci_allocate_iso_context(struct fw_card *card,
ret = context_init(&ctx->context, ohci, regs, callback);
if (ret < 0)
goto out_with_header;
goto out;
fw_iso_context_init_work(&ctx->base, ohci_isoc_context_work);
if (type == FW_ISO_CONTEXT_RECEIVE_MULTICHANNEL) {
if (type != FW_ISO_CONTEXT_RECEIVE_MULTICHANNEL) {
ctx->sc.header = no_free_ptr(header);
} else {
set_multichannel_mask(ohci, 0);
ctx->mc.completed = 0;
}
return &ctx->base;
out_with_header:
if (type != FW_ISO_CONTEXT_RECEIVE_MULTICHANNEL) {
free_page((unsigned long)ctx->sc.header);
ctx->sc.header = NULL;
}
out:
scoped_guard(spinlock_irq, &ohci->lock) {
switch (type) {