diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-13 09:10:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-13 09:10:52 -0700 |
| commit | f683c9b134f2b0cb5d917296a142db1211468a78 (patch) | |
| tree | 3eaa4a63afc4de9b1674e46b4eb45a83f20ca521 /rust/kernel/firmware.rs | |
| parent | 36c254515dc6592c44db77b84908358979dd6b50 (diff) | |
| parent | bd2b7f62a0d5feda8b21c7371058e8cd2956151a (diff) | |
Merge tag 'driver-core-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here is a single driver core fix, and a .mailmap update.
The fix is for the rust driver core bindings, turned out that the
from_raw binding wasn't a good idea (don't want to pass a pointer to a
reference counted object without actually incrementing the pointer.)
So this change fixes it up as the from_raw binding came in in -rc1.
The other change is a .mailmap update.
Both have been in linux-next for a while with no reported issues"
* tag 'driver-core-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
mailmap: update mail for Fiona Behrens
rust: device: change the from_raw() function
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(); |