diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2025-05-06 09:09:49 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2025-05-06 09:09:49 +0200 |
| commit | 6a5ca33b88b5cd6ff216593dc8d13c8b4bef6704 (patch) | |
| tree | 041f4509bc167ef83376c97972128eae996b6e2b /rust/kernel | |
| parent | 8ecd32b668238a7a79b2f44b66dae8ffb87ac763 (diff) | |
| parent | 5e0c67998152bdb91b056160449ee542b86271a5 (diff) | |
| download | linux-6a5ca33b88b5cd6ff216593dc8d13c8b4bef6704.tar.gz linux-6a5ca33b88b5cd6ff216593dc8d13c8b4bef6704.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging drm-next to get fixes from v6.15-rc5.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
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 { |