github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: usb-audio: Use flexible allocation for Scarlett2 packets

Browse Source 
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>
Link: https://patch.msgid.link/20260519004935.627797-1-rosenp@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Rosen Penev 2026-05-18 17:49:35 -07:00 committed by Takashi Iwai
parent cce8ec8209
commit 0c09413bde
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/usb/mixer_scarlett2.c
View File

@ -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;