Merge tag 'chrome-platform-firmware-for-6.13' of git://git.kernel.org/pub/scm/linux...

[linux.git] / drivers / firmware / sysfb.c

diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c
index 770e74be14f33a29e248faf3f8a699422c503706..7c5c03f274b951af84a8f69689d55aa7a5448c77 100644 (file)
--- a/drivers/firmware/sysfb.c
+++ b/drivers/firmware/sysfb.c
@@ -67,9 +67,11 @@ static bool sysfb_unregister(void)
 void sysfb_disable(struct device *dev)
 {
        struct screen_info *si = &screen_info;
+       struct device *parent;
 
        mutex_lock(&disable_lock);
-       if (!dev || dev == sysfb_parent_dev(si)) {
+       parent = sysfb_parent_dev(si);
+       if (!dev || !parent || dev == parent) {
                sysfb_unregister();
                disabled = true;
        }