From e6c7c38f9c688555404b94aa67648b4792a96da1 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Mon, 14 Sep 2009 10:47:07 +0800 Subject: [PATCH] --- yaml --- r: 166017 b: refs/heads/master c: b7e53aba2f0e6abf23e3f07b38b241145c33a005 h: refs/heads/master i: 166015: e86f36cb0dc34fbe73789c231a99778af08552d7 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34b342f524ae..385de11631f4 100644 --- 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 index c57c1744cecf..b93814c0d3e2 100644 --- 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);