diff options
| author | Greg Kroah-Hartman <[email protected]> | 2017-06-03 09:47:16 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2017-06-03 09:47:16 +0900 |
| commit | b132e4a25dccf5d5857e6ce2d96541be51aa9c5e (patch) | |
| tree | 64a6474bc7c218ff228469fda4600556217939b8 /drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | |
| parent | b3addcf0d1f04f53fcc302577d5a5e964c18531a (diff) | |
| parent | afbbc7913a288c29616bd31ae612548f6475151a (diff) | |
Merge tag 'fixes-for-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.12-rc4
A fix to a really old synchronization bug on mass storage gadget.
Support for Meson8 SoCs on dwc2
Synchronization fixes on renesas USB driver.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 236d9950221b..c0d8c6ff6380 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -425,10 +425,15 @@ bool amdgpu_fbdev_robj_is_fb(struct amdgpu_device *adev, struct amdgpu_bo *robj) void amdgpu_fbdev_restore_mode(struct amdgpu_device *adev) { - struct amdgpu_fbdev *afbdev = adev->mode_info.rfbdev; + struct amdgpu_fbdev *afbdev; struct drm_fb_helper *fb_helper; int ret; + if (!adev) + return; + + afbdev = adev->mode_info.rfbdev; + if (!afbdev) return; |