diff mbox

[3/3] fbcon: fix situation where fbcon gets deinitialised and can't reinit.

Message ID 1292895677-4242-4-git-send-email-airlied@gmail.com (mailing list archive)
State Accepted
Commit 32b98bf8752c5483481f77d48934aba26c967fcd
Headers show

Commit Message

Dave Airlie Dec. 21, 2010, 1:41 a.m. UTC
None
diff mbox

Patch

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 7ccc967..6662687 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -823,10 +823,10 @@  static int set_con2fb_map(int unit, int newidx, int user)
 	if (oldidx == newidx)
 		return 0;
 
-	if (!info || fbcon_has_exited)
+	if (!info)
 		return -EINVAL;
 
- 	if (!err && !search_for_mapped_con()) {
+	if (!search_for_mapped_con() || !con_is_bound(&fb_con)) {
 		info_idx = newidx;
 		return fbcon_takeover(0);
 	}