diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2025-05-01 10:22:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-05-01 10:22:20 +0200 |
| commit | 6e5bea1c93062a43bc0435ae6cd589448094edaa (patch) | |
| tree | f32eaae009d091efae24f376637c155462442691 /rust/kernel | |
| parent | ALSA: hda/realtek - Add more HP laptops which need mute led fixup (diff) | |
| parent | ASoC: intel/sdw_utils: Add volume limits to CS35L56 (diff) | |
| download | wireguard-linux-6e5bea1c93062a43bc0435ae6cd589448094edaa.tar.xz wireguard-linux-6e5bea1c93062a43bc0435ae6cd589448094edaa.zip | |
Merge tag 'asoc-fix-v6.15-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.15
A moderately large batch of fixes for v6.15, many driver specific
including cleanups for the enabling of the Cirrus KUnit tests and a fix
for a nasty crash on resume on AMD systems. We also have one core fix,
for an ordering issue between DAPM and DPCM which could leave things
incorrectly unpowered.
Diffstat (limited to 'rust/kernel')
| -rw-r--r-- | rust/kernel/firmware.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index f04b058b09b2..2494c96e105f 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -4,7 +4,7 @@ //! //! C header: [`include/linux/firmware.h`](srctree/include/linux/firmware.h) -use crate::{bindings, device::Device, error::Error, error::Result, str::CStr}; +use crate::{bindings, device::Device, error::Error, error::Result, ffi, str::CStr}; use core::ptr::NonNull; /// # Invariants @@ -12,7 +12,11 @@ use core::ptr::NonNull; /// One of the following: `bindings::request_firmware`, `bindings::firmware_request_nowarn`, /// `bindings::firmware_request_platform`, `bindings::request_firmware_direct`. struct FwFunc( - unsafe extern "C" fn(*mut *const bindings::firmware, *const u8, *mut bindings::device) -> i32, + unsafe extern "C" fn( + *mut *const bindings::firmware, + *const ffi::c_char, + *mut bindings::device, + ) -> i32, ); impl FwFunc { |