Title: [5300] trunk/drivers/serial/bfin_5xx.c: Task[#3428] Save kgdboc port and trap into kgdb per gdb break.
Revision
5300
Author
sonicz
Date
2008-09-17 03:11:41 -0500 (Wed, 17 Sep 2008)

Log Message

Task[#3428] Save kgdboc port and trap into kgdb per gdb break.

Modified Paths

Diff

Modified: trunk/drivers/serial/bfin_5xx.c (5299 => 5300)


--- trunk/drivers/serial/bfin_5xx.c	2008-09-16 19:56:07 UTC (rev 5299)
+++ trunk/drivers/serial/bfin_5xx.c	2008-09-17 08:11:41 UTC (rev 5300)
@@ -166,8 +166,7 @@
 
 #if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
 	defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-	if (kgdb_connected && kgdboc_break_enabled &&
-		kgdboc_port_line == uart->port.line) {
+	if (kgdb_connected && kgdboc_port_line == uart->port.line) {
 		if (ch == 0x3) {/* Ctrl + C */
 			kgdb_breakpoint();
 			return;
@@ -902,16 +901,15 @@
 static void bfin_kgdboc_port_shutdown(struct uart_port *port)
 {
 	if (kgdboc_break_enabled) {
-		bfin_serial_shutdown(port);
 		kgdboc_break_enabled = 0;
+		bfin_serial_shutdown(port);
 	}
 }
 
 static int bfin_kgdboc_port_startup(struct uart_port *port)
 {
-	bfin_serial_startup(port);
-	kgdboc_break_enabled = 1;
-
+	kgdboc_port_line = port->line;
+	kgdboc_break_enabled = !bfin_serial_startup(port);
 	return 0;
 }
 #endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to