projects/linux·commit 5b94d541

Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

5b94d541 · Linus Torvalds <[email protected]> · 2007-01-11 18:25:20 -08:00

* '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.
Commit
5b94d541806da24c8dbbff629486d65ce71dec46
Parents
e176d397 · eac681b3

Merge commit. Changes below are compared with the first parent: e176d397.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/char/drm/i915_irq.cmodified+1−1View file

drivers/char/drm/i915_irq.c

View file
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index e2c4b3a..78c1ae2 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);
}