From: Rosen Penev <rosenp@gmail.com>
To: linux-sound@vger.kernel.org
Cc: "Geoffrey D. Bennett" <g@b4.vu>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] ALSA: usb-audio: Use flexible allocation for Scarlett2 packets
Date: Mon, 18 May 2026 17:49:35 -0700 [thread overview]
Message-ID: <20260519004935.627797-1-rosenp@gmail.com> (raw)
Allocate Scarlett2 USB packets and request buffers with the flex
allocation helpers for their trailing data arrays.
Keep the computed packet sizes where they are still needed for USB
transfer lengths.
Assisted-by: Codex:GPT-5.5
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
sound/usb/mixer_scarlett2.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c
index 7ab3c0dd4755..2bdeb537a983 100644
--- a/sound/usb/mixer_scarlett2.c
+++ b/sound/usb/mixer_scarlett2.c
@@ -2614,13 +2614,13 @@ static int scarlett2_usb(
struct scarlett2_usb_packet *req __free(kfree) = NULL;
size_t req_buf_size = struct_size(req, data, req_size);
- req = kmalloc(req_buf_size, GFP_KERNEL);
+ req = kmalloc_flex(*req, data, req_size);
if (!req)
return -ENOMEM;
struct scarlett2_usb_packet *resp __free(kfree) = NULL;
size_t resp_buf_size = struct_size(resp, data, resp_size);
- resp = kmalloc(resp_buf_size, GFP_KERNEL);
+ resp = kmalloc_flex(*resp, data, resp_size);
if (!resp)
return -ENOMEM;
@@ -2830,9 +2830,9 @@ static int scarlett2_usb_set_data_buf(
u8 data[];
} __packed *req;
int err;
- int buf_size = struct_size(req, data, bytes);
+ size_t buf_size = struct_size(req, data, bytes);
- req = kmalloc(buf_size, GFP_KERNEL);
+ req = kmalloc_flex(*req, data, bytes);
if (!req)
return -ENOMEM;
@@ -9646,7 +9646,7 @@ static long scarlett2_hwdep_write(struct snd_hwdep *hw,
/* Create and send the request */
len = struct_size(req, data, count);
- req = kzalloc(len, GFP_KERNEL);
+ req = kzalloc_flex(*req, data, count);
if (!req)
return -ENOMEM;
--
2.54.0
next reply other threads:[~2026-05-19 0:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-19 0:49 Rosen Penev [this message]
2026-05-19 6:07 ` [PATCH] ALSA: usb-audio: Use flexible allocation for Scarlett2 packets Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260519004935.627797-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=g@b4.vu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.