浏览代码

[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>
Antonino A. Daplas 18 年之前
父节点
当前提交
7b566b1f7b
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      drivers/video/nvidia/nvidia.c

+ 5 - 1
drivers/video/nvidia/nvidia.c

@@ -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;
 }
 }