diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-04-30 10:13:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-04-30 10:13:48 +1000 |
| commit | 9b2788dbcef756a77659fa22e6a73bec4a57d126 (patch) | |
| tree | fe93f3a7ae6a689f86d1006ce73908da73411ffd /drivers/video | |
| parent | 12fc11bce6f29a73eb3d61ab4e76a9ece3da1f1d (diff) | |
| parent | 74deef03a44ae77db85dd80e7ef95777a902e0b3 (diff) | |
| download | linux-9b2788dbcef756a77659fa22e6a73bec4a57d126.tar.bz2 | |
Merge tag 'drm-misc-next-fixes-2021-04-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Two patches in drm-misc-next-fixes this week, one to fix the error
handling in TTM when a BO can't be swapped out and one to prevent a
wrong dereference in efifb.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210429090308.k3fuqvenf6vupfmg@gilmour
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/efifb.c | 6 |
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; } |