---

yaml --- r: 54899 b: refs/heads/master c: 6314db4 h: refs/heads/master i: 54897: 88a13a6 54895: 0c21d8e v: v3
git-mirror · May 8, 2007 · de944c7 · de944c7
1 parent f50a386
commit de944c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 042f10ec6533e53181284c96d22ae051e49ac707
+refs/heads/master: 6314db4110ad79cc666faff2209ed2691259afd9
diff --git a/trunk/drivers/video/s3fb.c b/trunk/drivers/video/s3fb.c
@@ -1061,6 +1061,7 @@ static int s3_pci_resume(struct pci_dev* dev)
 {
 	struct fb_info *info = pci_get_drvdata(dev);
 	struct s3fb_info *par = info->par;
+	int err;
 
 	dev_info(&(dev->dev), "resume\n");
 
@@ -1075,7 +1076,13 @@ static int s3_pci_resume(struct pci_dev* dev)
 
 	pci_set_power_state(dev, PCI_D0);
 	pci_restore_state(dev);
-	pci_enable_device(dev);
+	err = pci_enable_device(dev);
+	if (err) {
+		mutex_unlock(&(par->open_lock));
+		release_console_sem();
+		dev_err(&(dev->dev), "error %d enabling device for resume\n", err);
+		return err;
+	}
 	pci_set_master(dev);
 
 	s3fb_set_par(info);