diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-01-23 00:49:47 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-23 03:39:19 (GMT) |
| commit | 1139ffb96b3f4e8be9006552d2dd4d302d62c2ee (patch) | |
| tree | 7ee5b899a72c2ded6b00a77ba4a3de365a320daf /drivers | |
| parent | 2332b31116d5500d05173b2a7aaa95ba15d7983a (diff) | |
| download | linux-1139ffb96b3f4e8be9006552d2dd4d302d62c2ee.tar.xz | |
drm/nouveau: call drm_vblank_cleanup() earlier
Fixes a NULL-ptr deref seen on module unload sometimes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index a22d019..b4262ad 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -74,14 +74,14 @@ nouveau_display_vblank_fini(struct drm_device *dev) struct nouveau_display *disp = nouveau_display(dev); int i; + drm_vblank_cleanup(dev); + if (disp->vblank) { for (i = 0; i < dev->mode_config.num_crtc; i++) nouveau_event_ref(NULL, &disp->vblank[i]); kfree(disp->vblank); disp->vblank = NULL; } - - drm_vblank_cleanup(dev); } static int |