diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 14:43:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 14:43:40 -0400 |
| commit | d6bcfd1a214ae9609b27417b1844c6b6f09ca125 (patch) | |
| tree | 35555b713c6b013d87f2e0dd7a27723ba597c4a2 | |
| parent | 8ea3f0afb23bc49a996f262ea04708b38de82bca (diff) | |
| parent | 6939a5aca7cfada279a24c307e772f33104fca20 (diff) | |
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
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index c74e4e8006d4..2dd2c93ebfa3 100644 --- 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) | |||
| 2231 | dev_priv->mchdev_lock = &mchdev_lock; | 2231 | dev_priv->mchdev_lock = &mchdev_lock; |
| 2232 | spin_unlock(&mchdev_lock); | 2232 | spin_unlock(&mchdev_lock); |
| 2233 | 2233 | ||
| 2234 | /* XXX Prevent module unload due to memory corruption bugs. */ | ||
| 2235 | __module_get(THIS_MODULE); | ||
| 2236 | |||
| 2234 | return 0; | 2237 | return 0; |
| 2235 | 2238 | ||
| 2236 | out_workqueue_free: | 2239 | out_workqueue_free: |