3887a55909
Removed upstreamed: backport-5.15/430-v6.3-ubi-Fix-failure-attaching-when-vid_hdr-offset-equals.patch[1] backport-5.15/612-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch[2] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.108&id=85d7a7044b759d865d10395a357632af00de5867 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.108&id=906a6689bb0191ad2a44131a3377006aa098af59 Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From e2d375bf9ec7803e55e6885ce09e9c497a956114 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Thu, 28 Apr 2022 16:11:20 +0100
|
|
Subject: [PATCH] Revert "fbdev: Fix unregistering of framebuffers
|
|
without device"
|
|
|
|
This reverts commit 2388f826cdc9af2651991adc0feb79de9bdf2232.
|
|
---
|
|
drivers/video/fbdev/core/fbmem.c | 9 +--------
|
|
1 file changed, 1 insertion(+), 8 deletions(-)
|
|
|
|
--- a/drivers/video/fbdev/core/fbmem.c
|
|
+++ b/drivers/video/fbdev/core/fbmem.c
|
|
@@ -1631,14 +1631,7 @@ static void do_remove_conflicting_frameb
|
|
* If it's not a platform device, at least print a warning. A
|
|
* fix would add code to remove the device from the system.
|
|
*/
|
|
- if (!device) {
|
|
- /* TODO: Represent each OF framebuffer as its own
|
|
- * device in the device hierarchy. For now, offb
|
|
- * doesn't have such a device, so unregister the
|
|
- * framebuffer as before without warning.
|
|
- */
|
|
- do_unregister_framebuffer(registered_fb[i]);
|
|
- } else if (dev_is_platform(device)) {
|
|
+ if (dev_is_platform(device)) {
|
|
registered_fb[i]->forced_out = true;
|
|
platform_device_unregister(to_platform_device(device));
|
|
} else {
|