summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2022-04-14 22:17:18 +0200
committerHelge Deller <deller@gmx.de>2022-04-14 22:25:29 +0200
commitcabfa2bbe617ddf0a0cc4d01f72b584dae4939ad (patch)
treec8f110cb3da6680c88e5ab0bf83772ae61662528 /drivers/video
parentvideo: fbdev: fbmem: fix pointer reference to null device field (diff)
downloadlinux-cabfa2bbe617ddf0a0cc4d01f72b584dae4939ad.tar.xz
linux-cabfa2bbe617ddf0a0cc4d01f72b584dae4939ad.zip
Revert "video: fbdev: fbmem: fix pointer reference to null device field"
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
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/core/fbmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 1cfb2bd090b6..bdd00d381bbc 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1579,7 +1579,7 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,
* 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 && dev_is_platform(device)) {
+ if (dev_is_platform(device)) {
registered_fb[i]->forced_out = true;
platform_device_unregister(to_platform_device(device));
} else {