blob: 7c452f7c82a642b1919ac88e5223906a110e12c5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
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 {
|