From 400b8d395e363dcdeaef8cdaec78b6088df84ba4 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 3 Nov 2008 14:46:17 -0800
Subject: [PATCH] --- yaml --- r: 118677 b: refs/heads/master c:
 d3e74d0237b102d34979015fbf6df02ca4413074 h: refs/heads/master i:   118675:
 e12f45454722cd9db9d430d236f5e7a4823a4db4 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 350df5d477aa..7ee90fc702e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a47baa6ce7e6fb5fed8d1fd0af36a96a4ad133f
+refs/heads/master: d3e74d0237b102d34979015fbf6df02ca4413074
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 79944460d70a..9d4278be0ca0 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -852,8 +852,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	 * be lost or delayed
 	 */
 	if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev))
-		if (pci_enable_msi(dev->pdev))
-			DRM_ERROR("failed to enable MSI\n");
+		pci_enable_msi(dev->pdev);
 
 	intel_opregion_init(dev);