[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Call teardown_timer in i...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ccb3367e4be4
branches:  trunk
changeset: 797130:ccb3367e4be4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Jul 06 15:47:36 2014 +0000

description:
Call teardown_timer in i915_driver_unload.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 576efd082179 -r ccb3367e4be4 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sun Jul 06 15:44:55 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sun Jul 06 15:47:36 2014 +0000
@@ -1848,6 +1848,9 @@
 
        /* Free error state after interrupts are fully disabled. */
        del_timer_sync(&dev_priv->hangcheck_timer);
+#ifdef __NetBSD__
+       teardown_timer(&dev_priv->hangcheck_timer);
+#endif
        cancel_work_sync(&dev_priv->error_work);
        i915_destroy_error_state(dev);