diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-21 23:56:27 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-21 23:56:27 +0000 |
| commit | e85ec6693ac85a75da1f4b20beee255b6672cb33 (patch) | |
| tree | 3901b13958607b9e0579ca713081b2a62a315a36 | |
| parent | ea3de6daa4226cdcc4b50c339e0df6130014d2fe (diff) | |
| parent | 32c67922b722e375268789600cd89b80749e7a71 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
| -rw-r--r-- | linux-core/drm_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index 9df4ed24..637f5e1d 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -273,10 +273,10 @@ int drm_irq_uninstall(struct drm_device * dev) dev->driver->irq_uninstall(dev); - drm_vblank_cleanup(dev); - free_irq(dev->irq, dev); + drm_vblank_cleanup(dev); + dev->locked_tasklet_func = NULL; return 0; |