]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "video: fbdev: fbmem: fix pointer reference to null device field"
authorHelge Deller <deller@gmx.de>
Thu, 14 Apr 2022 20:17:18 +0000 (22:17 +0200)
committerHelge Deller <deller@gmx.de>
Thu, 14 Apr 2022 20:25:29 +0000 (22:25 +0200)
This reverts commit 279dbf333023a6bebce62fd29f577519cf6f678f.
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
drivers/video/fbdev/core/fbmem.c

index 1cfb2bd090b67ca9dce68453a1aed9e4613c0986..bdd00d381bbc411643a370105f22468317a0686f 100644 (file)
@@ -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 {