diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-12 03:25:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-12 03:25:20 +0100 |
| commit | 5b94d541806da24c8dbbff629486d65ce71dec46 (patch) | |
| tree | 9c029641a52ffc57d0244174bfd18edfd1759315 | |
| parent | [PATCH] PCMCIA: fix drivers broken by recent cleanup (diff) | |
| parent | i915: Fix a DRM_ERROR that should be DRM_DEBUG. (diff) | |
| download | linux-5b94d541806da24c8dbbff629486d65ce71dec46.tar.xz linux-5b94d541806da24c8dbbff629486d65ce71dec46.zip | |
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.
| -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) if (!drm_get_drawable_info(dev, swap.drawable)) { spin_unlock_irqrestore(&dev->drw_lock, irqflags); - DRM_ERROR("Invalid drawable ID %d\n", swap.drawable); + DRM_DEBUG("Invalid drawable ID %d\n", swap.drawable); return DRM_ERR(EINVAL); } |