---

yaml --- r: 166017 b: refs/heads/master c: b7e53ab h: refs/heads/master i: 166015: e86f36c v: v3
git-mirror · Sep 17, 2009 · e6c7c38 · e6c7c38
1 parent 52b30ce
commit e6c7c38
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07f73f6912667621276b002e33844ef283d98203
+refs/heads/master: b7e53aba2f0e6abf23e3f07b38b241145c33a005
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -99,8 +99,6 @@ static int i915_resume(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int ret = 0;
 
-	pci_set_power_state(dev->pdev, PCI_D0);
-	pci_restore_state(dev->pdev);
 	if (pci_enable_device(dev->pdev))
 		return -1;
 	pci_set_master(dev->pdev);