mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Fix kernel oops on boot due to bug in i2c driver.
https://github.com/NixOS/nixpkgs/issues/60126
https://lkml.org/lkml/2019/4/24/1123
The patch should be removed in the next round of stable releases because the fix should be included.
(cherry picked from commit 1e8a080589
)
This commit is contained in:
parent
2024421f04
commit
a9c40eef1f
12
pkgs/os-specific/linux/kernel/i2c-oops.patch
Normal file
12
pkgs/os-specific/linux/kernel/i2c-oops.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
diff --git a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
|
||||
index 1d645c9ab417bf..cac262a912c124 100644
|
||||
--- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
|
||||
+++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
|
||||
@@ -337,7 +337,8 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "FlexBook edge11 - M-FBE11"),
|
||||
},
|
||||
.driver_data = (void *)&sipodev_desc
|
||||
- }
|
||||
+ },
|
||||
+ { } /* Terminate list */
|
||||
};
|
|
@ -57,4 +57,8 @@ rec {
|
|||
sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
|
||||
};
|
||||
};
|
||||
|
||||
# Fix kernel OOPS on boot: https://github.com/NixOS/nixpkgs/issues/60126
|
||||
# Remove with the next release.
|
||||
i2c-oops = { name = "i2c-oops"; patch = ./i2c-oops.patch; };
|
||||
}
|
||||
|
|
|
@ -14988,6 +14988,7 @@ in
|
|||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.cpu-cgroup-v2."4.9"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.i2c-oops
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -14998,6 +14999,7 @@ in
|
|||
# when adding a new linux version
|
||||
kernelPatches.cpu-cgroup-v2."4.11"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.i2c-oops
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -15005,6 +15007,7 @@ in
|
|||
kernelPatches =
|
||||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.i2c-oops
|
||||
];
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue