git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From e2d375bf9ec7803e55e6885ce09e9c497a956114 Mon Sep 17 00:00:00 2001
   2 From: Dom Cobley <popcornmix@gmail.com>
   3 Date: Thu, 28 Apr 2022 16:11:20 +0100
   4 Subject: [PATCH] Revert "fbdev: Fix unregistering of framebuffers
   5  without device"
   6
   7 This reverts commit 2388f826cdc9af2651991adc0feb79de9bdf2232.
   8 ---
   9  drivers/video/fbdev/core/fbmem.c | 9 +--------
  10  1 file changed, 1 insertion(+), 8 deletions(-)
  11
  12 --- a/drivers/video/fbdev/core/fbmem.c
  13 +++ b/drivers/video/fbdev/core/fbmem.c
  14 @@ -1631,14 +1631,7 @@ static void do_remove_conflicting_frameb
  15                          * If it's not a platform device, at least print a warning. A
  16                          * fix would add code to remove the device from the system.
  17                          */
  18 -                       if (!device) {
  19 -                               /* TODO: Represent each OF framebuffer as its own
  20 -                                * device in the device hierarchy. For now, offb
  21 -                                * doesn't have such a device, so unregister the
  22 -                                * framebuffer as before without warning.
  23 -                                */
  24 -                               do_unregister_framebuffer(registered_fb[i]);
  25 -                       } else if (dev_is_platform(device)) {
  26 +                       if (dev_is_platform(device)) {
  27                                 registered_fb[i]->forced_out = true;
  28                                 platform_device_unregister(to_platform_device(device));
  29                         } else {