From b3cbbd5ca8ece51a75c1f0442968cee14daac2fb Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Tue, 3 Oct 2006 01:14:53 -0700 Subject: [PATCH] --- yaml --- r: 38059 b: refs/heads/master c: 7b566b1f7bdbbcfa8d11b8018c6dec5467f7c62b h: refs/heads/master i: 38057: f2970be732a42f7df9afc466bef3440157cda91f 38055: 9783419546749e53efabcaf95162ff22727945b5 v: v3 --- [refs] | 2 +- trunk/drivers/video/nvidia/nvidia.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc79f56bee7d..47f03a48c6a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0b10324b85d0379a2eec4984e77b25299a97ed4 +refs/heads/master: 7b566b1f7bdbbcfa8d11b8018c6dec5467f7c62b diff --git a/trunk/drivers/video/nvidia/nvidia.c b/trunk/drivers/video/nvidia/nvidia.c index f8cd4c519aeb..731edf7cb0a0 100644 --- a/trunk/drivers/video/nvidia/nvidia.c +++ b/trunk/drivers/video/nvidia/nvidia.c @@ -984,7 +984,10 @@ static int nvidiafb_resume(struct pci_dev *dev) if (par->pm_state != PM_EVENT_FREEZE) { pci_restore_state(dev); - pci_enable_device(dev); + + if (pci_enable_device(dev)) + goto fail; + pci_set_master(dev); } @@ -993,6 +996,7 @@ static int nvidiafb_resume(struct pci_dev *dev) fb_set_suspend (info, 0); nvidiafb_blank(FB_BLANK_UNBLANK, info); +fail: release_console_sem(); return 0; }