From bb640aa90d922e024817ff3f800e4a071678516d Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Thu, 14 Apr 2022 22:17:18 +0200
Subject: Revert "video: fbdev: fbmem: fix pointer reference to null device
field"
Git-commit: cabfa2bbe617ddf0a0cc4d01f72b584dae4939ad
Patch-mainline: v5.19-rc1
References: jsc#PED-1166 jsc#PED-1168 jsc#PED-1170 jsc#PED-1218 jsc#PED-1220 jsc#PED-1222 jsc#PED-1223 jsc#PED-1225
This reverts commit d6cd978f7e6b6f6895f8d0c4ce6e5d2c8e979afe.
It has been solved differently already.
Signed-off-by: Helge Deller <deller@gmx.de>
Acked-by: Paul Menzel <pmenzel@molgen.mpg.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220210065824.368355-1-zhouzhouyi@gmail.com
Acked-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/video/fbdev/core/fbmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 151c8202bb90..bc6ed750e915 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1586,7 +1586,7 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,
* framebuffer as before without warning.
*/
do_unregister_framebuffer(registered_fb[i]);
- } else if (device && dev_is_platform(device)) {
+ } else if (dev_is_platform(device)) {
registered_fb[i]->forced_out = true;
platform_device_unregister(to_platform_device(device));
} else {
--
2.38.1