diff options
| author | Dave Airlie <airlied@panoply-rh.(none)> | 2008-03-11 16:05:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@panoply-rh.(none)> | 2008-03-11 16:05:26 +1000 |
| commit | 5a7f4b3074d5cda909fc7329bc91da11d89181e1 (patch) | |
| tree | 33070b53e5fc9324e4c283c859544b3673005f58 /shared-core/i915_init.c | |
| parent | 52748d17923b7e501b707b950227864c0b64d8a1 (diff) | |
drm: fix oops on unload.
if we are unloading the module, there is no master so therefore no lock
Diffstat (limited to 'shared-core/i915_init.c')
| -rw-r--r-- | shared-core/i915_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index 274322e1..fa2fc3da 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -277,7 +277,6 @@ int i915_driver_unload(struct drm_device *dev) I915_WRITE(LP_RING + RING_LEN, 0); - if (drm_core_check_feature(dev, DRIVER_MODESET)) { drm_irq_uninstall(dev); intel_modeset_cleanup(dev); @@ -291,7 +290,6 @@ int i915_driver_unload(struct drm_device *dev) if (dev_priv->sarea_kmap.virtual) { drm_bo_kunmap(&dev_priv->sarea_kmap); dev_priv->sarea_kmap.virtual = NULL; - dev->primary->master->lock.hw_lock = NULL; dev->sigdata.lock = NULL; } |