From a9c3174e423d91a98694028b3aa813b562706e30 Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Tue, 3 Oct 2006 01:14:54 -0700 Subject: [PATCH] --- yaml --- r: 38060 b: refs/heads/master c: 9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/i810/i810_main.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 47f03a48c6a4..1881cc09979c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b566b1f7bdbbcfa8d11b8018c6dec5467f7c62b +refs/heads/master: 9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a diff --git a/trunk/drivers/video/i810/i810_main.c b/trunk/drivers/video/i810/i810_main.c index d42edaccb84c..b55a12d95eb2 100644 --- a/trunk/drivers/video/i810/i810_main.c +++ b/trunk/drivers/video/i810/i810_main.c @@ -1602,7 +1602,10 @@ static int i810fb_resume(struct pci_dev *dev) acquire_console_sem(); pci_set_power_state(dev, PCI_D0); pci_restore_state(dev); - pci_enable_device(dev); + + if (pci_enable_device(dev)) + goto fail; + pci_set_master(dev); agp_bind_memory(par->i810_gtt.i810_fb_memory, par->fb.offset); @@ -1611,6 +1614,7 @@ static int i810fb_resume(struct pci_dev *dev) i810fb_set_par(info); fb_set_suspend (info, 0); info->fbops->fb_blank(VESA_NO_BLANKING, info); +fail: release_console_sem(); return 0; }