From 778ed9110d3849645856222fab0c3f637509a4d1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 21 Aug 2012 16:40:07 +1000
Subject: [PATCH] --- yaml --- r: 321900 b: refs/heads/master c:
 ec5da7f8dc023fc4dcbdd42e87dad231d2c2812d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1e948d672920..3960e6b8712a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9160338de92c0305329be5163a76f849806e83de
+refs/heads/master: ec5da7f8dc023fc4dcbdd42e87dad231d2c2812d
diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c
index 2e471c22abf5..f8a79fca4a22 100644
--- a/trunk/drivers/video/console/fbcon.c
+++ b/trunk/drivers/video/console/fbcon.c
@@ -372,8 +372,12 @@ static void fb_flashcursor(struct work_struct *work)
 	struct vc_data *vc = NULL;
 	int c;
 	int mode;
+	int ret;
+
+	ret = console_trylock();
+	if (ret == 0)
+		return;
 
-	console_lock();
 	if (ops && ops->currcon != -1)
 		vc = vc_cons[ops->currcon].d;