summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux-core/i915_drv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index ffdbab06..d58ca589 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -172,7 +172,8 @@ static int i915_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
- pci_enable_device(pdev);
+ if (pci_enable_device(pdev))
+ return -1;
/* Disable outputs */
list_for_each_entry(output, &dev->mode_config.output_list, head)
@@ -294,8 +295,6 @@ static int i915_resume(struct pci_dev *pdev)
vgaHWLock(hwp);
#endif
- drm_initial_config(dev, 0);
-
return 0;
}