From 4b6e6ba362f9db53a674b2af1f860e11fe944b63 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Tue, 19 Jan 2010 06:13:12 -0500
Subject: [PATCH] --- yaml --- r: 185195 b: refs/heads/master c:
 cdc592d5d496e5c813d9632d0d1e334658927af7 h: refs/heads/master i:   185193:
 4e9dc307d6f2342d8e8da183965da7195bd20123   185191:
 cac2a3c3c375c106322330b05fa4cbc2e8cceaf2 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/serial/bfin_5xx.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b71de1eae1a9..e7c8b46bc6e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ed43f6af88b042eb2ac5a3eda1e8e17efae74ee
+refs/heads/master: cdc592d5d496e5c813d9632d0d1e334658927af7
diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c
index b5a9b374dad5..6b8795557b38 100644
--- a/trunk/drivers/serial/bfin_5xx.c
+++ b/trunk/drivers/serial/bfin_5xx.c
@@ -237,7 +237,8 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
 
 #if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
 	defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-	if (kgdb_connected && kgdboc_port_line == uart->port.line)
+	if (kgdb_connected && kgdboc_port_line == uart->port.line
+		&& kgdboc_break_enabled)
 		if (ch == 0x3) {/* Ctrl + C */
 			kgdb_breakpoint();
 			return;