summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKai-Heng Feng <kai.heng.feng@canonical.com>2021-04-14 01:05:08 +0800
committerAlex Deucher <alexander.deucher@amd.com>2021-04-13 18:19:11 -0400
commitd510c88cfbb294d2b1e2d0b71576e9b79d0e2e83 (patch)
treeadf2b84e3a4cf7e60702a09bacb38ee1151ad0d4 /drivers
parent6a3608eae6d33a478a29348eb5e9ca330a528ae6 (diff)
downloadlinux-stable-d510c88cfbb294d2b1e2d0b71576e9b79d0e2e83.tar.gz
linux-stable-d510c88cfbb294d2b1e2d0b71576e9b79d0e2e83.tar.bz2
linux-stable-d510c88cfbb294d2b1e2d0b71576e9b79d0e2e83.zip
efifb: Check efifb_pci_dev before using it
On some platforms like Hyper-V and RPi4 with UEFI firmware, efifb is not a PCI device. So make sure efifb_pci_dev is found before using it. Fixes: a6c0fd3d5a8b ("efifb: Ensure graphics device for efifb stays at PCI D0") BugLink: https://bugs.launchpad.net/bugs/1922403 Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210413170508.968148-1-kai.heng.feng@canonical.com
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/efifb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index f58a545b3bf3..8ea8f079cde2 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -575,7 +575,8 @@ static int efifb_probe(struct platform_device *dev)
goto err_fb_dealoc;
}
fb_info(info, "%s frame buffer device\n", info->fix.id);
- pm_runtime_get_sync(&efifb_pci_dev->dev);
+ if (efifb_pci_dev)
+ pm_runtime_get_sync(&efifb_pci_dev->dev);
return 0;
err_fb_dealoc:
@@ -602,7 +603,8 @@ static int efifb_remove(struct platform_device *pdev)
unregister_framebuffer(info);
sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
framebuffer_release(info);
- pm_runtime_put(&efifb_pci_dev->dev);
+ if (efifb_pci_dev)
+ pm_runtime_put(&efifb_pci_dev->dev);
return 0;
}