---

yaml --- r: 201388 b: refs/heads/master c: 00b4703 h: refs/heads/master v: v3
git-mirror · Jul 30, 2010 · 92ca10f · 92ca10f
1 parent cb89df1
commit 92ca10f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2d2420bbf4bb125ea5f2e1573d4da6b668fc78a
+refs/heads/master: 00b4703f03ce04bd7f2f912fd05a243096ab826f
diff --git a/trunk/drivers/video/cyber2000fb.c b/trunk/drivers/video/cyber2000fb.c
@@ -436,6 +436,8 @@ static void cyber2000fb_write_ramdac_ctrl(struct cfb_info *cfb)
 	cyber2000fb_writeb(i | 4, 0x3cf, cfb);
 	cyber2000fb_writeb(val, 0x3c6, cfb);
 	cyber2000fb_writeb(i, 0x3cf, cfb);
+	/* prevent card lock-up observed on x86 with CyberPro 2000 */
+	cyber2000fb_readb(0x3cf, cfb);
 }
 
 static void cyber2000fb_set_timing(struct cfb_info *cfb, struct par_info *hw)