---

yaml --- r: 322166 b: refs/heads/master c: d8636a2 h: refs/heads/master v: v3
git-mirror · Aug 22, 2012 · 2eec7c9 · 2eec7c9
1 parent 158992c
commit 2eec7c9
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: 27fc4f1c0be917b1e5cef934783f9b09e28e92ea
+refs/heads/master: d8636a2717bb3da2a7ce2154bf08de90bb8c87b0
diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c
@@ -372,8 +372,15 @@ static void fb_flashcursor(struct work_struct *work)
 	struct vc_data *vc = NULL;
 	int c;
 	int mode;
+	int ret;
+
+	/* FIXME: we should sort out the unbind locking instead */
+	/* instead we just fail to flash the cursor if we can't get
+	 * the lock instead of blocking fbcon deinit */
+	ret = console_trylock();
+	if (ret == 0)
+		return;
 
-	console_lock();
 	if (ops && ops->currcon != -1)
 		vc = vc_cons[ops->currcon].d;