950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch 1.1 KB

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