From 2d3a950b1be0e87cc0e1512ee5b70b226a494150 Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Tue, 24 Jun 2008 10:38:31 -0700 Subject: [PATCH] --- yaml --- r: 98408 b: refs/heads/master c: ea7b44c8e6baa1a4507f05ba2c0009ac21c3fe0b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/i915_drv.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f4ae3f7c157e..35158602195d 100644 --- 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 index e8f3d682e3b1..93aed1c38bd2 100644 --- 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);