From 920e3cf882964e33e8bd367bb580cad2adf9b1e4 Mon Sep 17 00:00:00 2001
From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Mon, 26 Apr 2010 16:37:53 +0000
Subject: [PATCH] --- yaml --- r: 218767 b: refs/heads/master c:
 b75f2c01de34daf0b25cbd75fcf00511548ffa1e h: refs/heads/master i:   218765:
 d77ead2a1eb05208ce0bdeed8fbee38bed39ce8c   218763:
 6db3ecd006e7c89ac71a57e679343bed902a4ab7   218759:
 7cf4fe8d4692f8b8eeeb090b8273df24955f9be3   218751:
 24e7af6e5eecef4410fd6514e5bcd861455a5cc1 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/video/via/viafbdev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c0ec01156586..3e74b71b68cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fd9b6cc38028ea64e9a39c6af9d5ad928594be6
+refs/heads/master: b75f2c01de34daf0b25cbd75fcf00511548ffa1e
diff --git a/trunk/drivers/video/via/viafbdev.c b/trunk/drivers/video/via/viafbdev.c
index 596235b5a5f0..6a7327eaf869 100644
--- a/trunk/drivers/video/via/viafbdev.c
+++ b/trunk/drivers/video/via/viafbdev.c
@@ -1705,6 +1705,9 @@ int viafb_resume(struct pci_dev *pdev)
 		    viaparinfo->shared->saved_regs,
 		    0x100 * sizeof(u32));
 
+	viafb_set_par(viafbinfo);
+	if (viafb_dual_fb)
+		viafb_set_par(viafbinfo1);
 	fb_set_suspend(viafbinfo, 0);
 
 fail: