openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Antonino A. Daplas 2006-10-03 01:14:53 -07:00 committed by Linus Torvalds
parent b0b10324b8
commit 7b566b1f7b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/video/nvidia/nvidia.c
View File

@ -984,7 +984,10 @@ static int nvidiafb_resume(struct pci_dev *dev)
if (par->pm_state != PM_EVENT_FREEZE) { if (par->pm_state != PM_EVENT_FREEZE) {
pci_restore_state(dev); pci_restore_state(dev);
pci_enable_device(dev);
if (pci_enable_device(dev))
goto fail;
pci_set_master(dev); pci_set_master(dev);
} }
@ -993,6 +996,7 @@ static int nvidiafb_resume(struct pci_dev *dev)
fb_set_suspend (info, 0); fb_set_suspend (info, 0);
nvidiafb_blank(FB_BLANK_UNBLANK, info); nvidiafb_blank(FB_BLANK_UNBLANK, info);
fail:
release_console_sem(); release_console_sem();
return 0; return 0;
} }