---

yaml --- r: 305207 b: refs/heads/master c: a4e02f6 h: refs/heads/master i: 305205: 72ff7c2 305203: 2fd58a6 305199: 56402f8 v: v3
git-mirror · Apr 12, 2012 · ed0d2c4 · ed0d2c4
1 parent 2470c2d
commit ed0d2c4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee565105ccedc63728a83f4deb1c10dc57091959
+refs/heads/master: a4e02f6d83d4fcdb13bcaba76878fc5ea0da9911
diff --git a/trunk/drivers/tty/serial/sh-sci.c b/trunk/drivers/tty/serial/sh-sci.c
@@ -1565,31 +1565,31 @@ static void sci_enable_ms(struct uart_port *port)
 static void sci_break_ctl(struct uart_port *port, int break_state)
 {
 	struct sci_port *s = to_sci_port(port);
+	struct plat_sci_reg *reg = sci_regmap[s->cfg->regtype] + SCSPTR;
 	unsigned short scscr, scsptr;
 
-	switch (s->cfg->regtype) {
-	case SCIx_SH4_SCIF_REGTYPE:
-		scsptr = serial_port_in(port, SCSPTR);
-		scscr = serial_port_in(port, SCSCR);
-
-		if (break_state == -1) {
-			scsptr = (scsptr | SCSPTR_SPB2IO) & ~SCSPTR_SPB2DT;
-			scscr &= ~SCSCR_TE;
-		} else {
-			scsptr = (scsptr | SCSPTR_SPB2DT) & ~SCSPTR_SPB2IO;
-			scscr |= SCSCR_TE;
-		}
-
-		serial_port_out(port, SCSPTR, scsptr);
-		serial_port_out(port, SCSCR, scscr);
-		break;
-	default:
+	/* check wheter the port has SCSPTR */
+	if (!reg->size) {
 		/*
 		 * Not supported by hardware. Most parts couple break and rx
 		 * interrupts together, with break detection always enabled.
 		 */
-		break;
+		return;
 	}
+
+	scsptr = serial_port_in(port, SCSPTR);
+	scscr = serial_port_in(port, SCSCR);
+
+	if (break_state == -1) {
+		scsptr = (scsptr | SCSPTR_SPB2IO) & ~SCSPTR_SPB2DT;
+		scscr &= ~SCSCR_TE;
+	} else {
+		scsptr = (scsptr | SCSPTR_SPB2DT) & ~SCSPTR_SPB2IO;
+		scscr |= SCSCR_TE;
+	}
+
+	serial_port_out(port, SCSPTR, scsptr);
+	serial_port_out(port, SCSCR, scscr);
 }
 
 #ifdef CONFIG_SERIAL_SH_SCI_DMA