diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:08:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:08:49 -0700 |
| commit | ad360bbbbecc90c654ea1fcd8178366814a9f93a (patch) | |
| tree | 14ff73838c12f61686f6f4367132bcce95660152 /drivers/char/drm/i915_irq.c | |
| parent | bc8844ed9b90d348011c31956dd7fef8549efb24 (diff) | |
| parent | c4814f9001a8dd28e39311a919beac34f778f76d (diff) | |
Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: make sure the drawable code doesn't call malloc(0).
drm/radeon: add more IGP chipset pci ids
drm: Spinlock initializer cleanup
Diffstat (limited to 'drivers/char/drm/i915_irq.c')
| -rw-r--r-- | drivers/char/drm/i915_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index 78c1ae28f17..b92062a239f 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c @@ -582,7 +582,7 @@ void i915_driver_irq_postinstall(drm_device_t * dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; - dev_priv->swaps_lock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&dev_priv->swaps_lock); INIT_LIST_HEAD(&dev_priv->vbl_swaps.head); dev_priv->swaps_pending = 0; |