Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67475
b: refs/heads/master
c: d948a29
h: refs/heads/master
i:
  67473: 11359db
  67471: 4734c75
v: v3
  • Loading branch information
Scott Wood authored and Kumar Gala committed Oct 4, 2007
1 parent 9ce981b commit 5172ed0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c1dcfd9d199043ff0e8805484a736ad36d9dd04a
refs/heads/master: d948a29ea7a9514f588dafb61d5a6da68131c3ba
3 changes: 3 additions & 0 deletions trunk/drivers/serial/cpm_uart/cpm_uart_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,8 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
udbg_putc = NULL;
#endif

cpm_line_cr_cmd(pinfo, CPM_CR_STOP_TX);

if (IS_SMC(pinfo)) {
clrbits8(&pinfo->smcp->smc_smcm, SMCM_RX | SMCM_TX);
clrbits16(&pinfo->smcp->smc_smcmr, SMCMR_REN | SMCMR_TEN);
Expand All @@ -1346,6 +1348,7 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
cpm_uart_init_scc(pinfo);

uart_set_options(port, co, baud, parity, bits, flow);
cpm_line_cr_cmd(pinfo, CPM_CR_RESTART_TX);

return 0;
}
Expand Down

0 comments on commit 5172ed0

Please sign in to comment.