projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0b1032
)
[PATCH] nvidiafb: Honor the return value of pci_enable_device
author
Antonino A. Daplas
<adaplas@gmail.com>
Tue, 3 Oct 2006 08:14:53 +0000
(
01:14
-0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 3 Oct 2006 15:04:11 +0000
(08:04 -0700)
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>
drivers/video/nvidia/nvidia.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/video/nvidia/nvidia.c
b/drivers/video/nvidia/nvidia.c
index f8cd4c519aebf1125ba9e6a347be3cdc67f80418..731edf7cb0a07036e79d64146f656e0105212ba2 100644
(file)
--- a/
drivers/video/nvidia/nvidia.c
+++ b/
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;
}