Module Name: src
Committed By: riastradh
Date: Sun Jul 6 15:47:36 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c
Log Message:
Call teardown_timer in i915_driver_unload.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.6 Thu Jun 12 19:11:51 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sun Jul 6 15:47:36 2014
@@ -1848,6 +1848,9 @@ int i915_driver_unload(struct drm_device
/* 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);
