diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 21:25:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 21:25:20 -0500 |
| commit | 5b94d541806da24c8dbbff629486d65ce71dec46 (patch) | |
| tree | 9c029641a52ffc57d0244174bfd18edfd1759315 /drivers/char | |
| parent | e176d397ad73ca76936e5638c2c81740dedb9d5d (diff) | |
| parent | eac681b3aec226c83f52d307254d88393aab5eb9 (diff) | |
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
i915: Fix a DRM_ERROR that should be DRM_DEBUG.
Diffstat (limited to 'drivers/char')
| -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 e2c4b3a41b1e..78c1ae28f17c 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c | |||
| @@ -500,7 +500,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS) | |||
| 500 | 500 | ||
| 501 | if (!drm_get_drawable_info(dev, swap.drawable)) { | 501 | if (!drm_get_drawable_info(dev, swap.drawable)) { |
| 502 | spin_unlock_irqrestore(&dev->drw_lock, irqflags); | 502 | spin_unlock_irqrestore(&dev->drw_lock, irqflags); |
| 503 | DRM_ERROR("Invalid drawable ID %d\n", swap.drawable); | 503 | DRM_DEBUG("Invalid drawable ID %d\n", swap.drawable); |
| 504 | return DRM_ERR(EINVAL); | 504 | return DRM_ERR(EINVAL); |
| 505 | } | 505 | } |
| 506 | 506 | ||