diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2006-10-03 04:14:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:11 -0400 |
commit | 7b566b1f7bdbbcfa8d11b8018c6dec5467f7c62b (patch) | |
tree | d0bd3fb31be0426199f2024354cc042e0b18bfeb /drivers/video/nvidia/nvidia.c | |
parent | b0b10324b85d0379a2eec4984e77b25299a97ed4 (diff) |
[PATCH] nvidiafb: Honor the return value of pci_enable_device
Check the return value of pci_enable_device().
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
-rw-r--r-- | drivers/video/nvidia/nvidia.c | 6 |
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 | ||
999 | fail: | ||
996 | release_console_sem(); | 1000 | release_console_sem(); |
997 | return 0; | 1001 | return 0; |
998 | } | 1002 | } |