From 4d914a0321ef58dfa968629c5a9dcf0e62a314ad Mon Sep 17 00:00:00 2001 From: Admin Pupkin Date: Wed, 20 May 2026 23:31:48 +0300 Subject: [PATCH] Add P46b fix for ac97d mutable pcid_handle borrow P46 migrated ac97d to pci_allocate_interrupt_vector but missed adding to the pcid_handle parameter. This caused build failure: cannot borrow pcid_handle as mutable. --- local/patches/base/P46b-ac97d-mutable-fix.patch | 5 +++++ recipes/core/base/P46b-ac97d-mutable-fix.patch | 1 + recipes/core/base/recipe.toml | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 local/patches/base/P46b-ac97d-mutable-fix.patch create mode 120000 recipes/core/base/P46b-ac97d-mutable-fix.patch diff --git a/local/patches/base/P46b-ac97d-mutable-fix.patch b/local/patches/base/P46b-ac97d-mutable-fix.patch new file mode 100644 index 0000000000..3c1a9da5b4 --- /dev/null +++ b/local/patches/base/P46b-ac97d-mutable-fix.patch @@ -0,0 +1,5 @@ +--- a/drivers/audio/ac97d/src/main.rs ++++ b/drivers/audio/ac97d/src/main.rs +@@ -20 +20 @@ fn main() { +-fn daemon(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! { ++fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! { diff --git a/recipes/core/base/P46b-ac97d-mutable-fix.patch b/recipes/core/base/P46b-ac97d-mutable-fix.patch new file mode 120000 index 0000000000..8e16e55b18 --- /dev/null +++ b/recipes/core/base/P46b-ac97d-mutable-fix.patch @@ -0,0 +1 @@ +../../../local/patches/base/P46b-ac97d-mutable-fix.patch \ No newline at end of file diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index 49293f5d53..39549d21e1 100644 --- a/recipes/core/base/recipe.toml +++ b/recipes/core/base/recipe.toml @@ -95,6 +95,8 @@ patches = [ "P45-net-msix-adoption.patch", # P46: Migrate ahcid and ac97d to MSI-X via pci_allocate_interrupt_vector "P46-storage-audio-msix.patch", + # P46b: Fix ac97d mutable borrow of pcid_handle (required by pci_allocate_interrupt_vector) + "P46b-ac97d-mutable-fix.patch", # P47: Update thermald to read from P44 thermal zones and coretempd "P47-thermald-backend.patch", # P48: Add ACPI fan device discovery and status exposure