diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:42:22 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:42:22 +0200 |
commit | d723c456ef5ad60d368e62791004fd152c4380aa (patch) | |
tree | e517740ce6685407ead9cf300c93fd6c2b5df451 /rust/kernel/firmware.rs | |
parent | ffb4b4ed3e8f4782072ff03513f3531be6b2d3a7 (diff) | |
parent | 42f7652d3eb527d03665b09edac47f85fb600924 (diff) |
Merge 6.12-rc4 into char-misc-next
We need the iio fixes from 6.12-rc4 in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'rust/kernel/firmware.rs')
-rw-r--r-- | rust/kernel/firmware.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index dee5b4b18aec..13a374a5cdb7 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -44,7 +44,7 @@ impl FwFunc { /// /// # fn no_run() -> Result<(), Error> { /// # // SAFETY: *NOT* safe, just for the example to get an `ARef<Device>` instance -/// # let dev = unsafe { Device::from_raw(core::ptr::null_mut()) }; +/// # let dev = unsafe { Device::get_device(core::ptr::null_mut()) }; /// /// let fw = Firmware::request(c_str!("path/to/firmware.bin"), &dev)?; /// let blob = fw.data(); |