---

yaml --- r: 98408 b: refs/heads/master c: ea7b44c h: refs/heads/master v: v3
git-mirror · Jun 24, 2008 · 2d3a950 · 2d3a950
1 parent 905ad68
commit 2d3a950
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72c6e251ed84b3a9cdfde6711191155c47bb2b9c
+refs/heads/master: ea7b44c8e6baa1a4507f05ba2c0009ac21c3fe0b
diff --git a/trunk/drivers/char/drm/i915_drv.c b/trunk/drivers/char/drm/i915_drv.c
@@ -389,6 +389,7 @@ static int i915_resume(struct drm_device *dev)
 	pci_restore_state(dev->pdev);
 	if (pci_enable_device(dev->pdev))
 		return -1;
+	pci_set_master(dev->pdev);
 
 	pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);