Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915: Prevent module unload to avoid random memory corruption

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915: Prevent module unload to avoid random memory corruption
d6bcfd1a · Linus Torvalds · 8ea3f0af · 6939a5ac · d6bcfd1a
Commit d6bcfd1a authored Oct 09, 2010 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_dma.c +3 -0

No files found.
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2231,6 +2231,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	dev_priv->mchdev_lock = &mchdev_lock;
 	spin_unlock(&mchdev_lock);

+	/* XXX Prevent module unload due to memory corruption bugs. */
+	__module_get(THIS_MODULE);
+
 	return 0;

 out_workqueue_free: