aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/nvidia')
-rw-r--r--drivers/video/nvidia/nvidia.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index f8cd4c519aeb..731edf7cb0a0 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -984,7 +984,10 @@ static int nvidiafb_resume(struct pci_dev *dev)
984 984
985 if (par->pm_state != PM_EVENT_FREEZE) { 985 if (par->pm_state != PM_EVENT_FREEZE) {
986 pci_restore_state(dev); 986 pci_restore_state(dev);
987 pci_enable_device(dev); 987
988 if (pci_enable_device(dev))
989 goto fail;
990
988 pci_set_master(dev); 991 pci_set_master(dev);
989 } 992 }
990 993
@@ -993,6 +996,7 @@ static int nvidiafb_resume(struct pci_dev *dev)
993 fb_set_suspend (info, 0); 996 fb_set_suspend (info, 0);
994 nvidiafb_blank(FB_BLANK_UNBLANK, info); 997 nvidiafb_blank(FB_BLANK_UNBLANK, info);
995 998
999fail:
996 release_console_sem(); 1000 release_console_sem();
997 return 0; 1001 return 0;
998} 1002}