From de944c7e4718f6b5ee605a704f2c957881c27a59 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 8 May 2007 00:38:11 -0700
Subject: [PATCH] --- yaml --- r: 54899 b: refs/heads/master c:
 6314db4110ad79cc666faff2209ed2691259afd9 h: refs/heads/master i:   54897:
 88a13a605a3b6a8acf5f938c53d93dc2b32d282e   54895:
 0c21d8e613f6623ce0b31cfce9e9a7bb9f0ed7ab v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/video/s3fb.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 542c8ebd323e..ed58d0b3b36b 100644
--- 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
index 3091b20124b4..c348813e6132 100644
--- 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);