Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19103
b: refs/heads/master
c: ba899db
h: refs/heads/master
i:
  19101: b9cf189
  19099: 3231f55
  19095: 942861d
  19087: f28c3a6
  19071: 052bce8
v: v3
  • Loading branch information
Russell King authored and Russell King committed Jan 21, 2006
1 parent e0f01a0 commit 7f8b7bb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ca740803856f23dbc5b1872039291231bc131ecb
refs/heads/master: ba899dbc036d24ab6b45faf64e3648a268721cc9
4 changes: 2 additions & 2 deletions trunk/drivers/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1870,7 +1870,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
mutex_lock(&state->mutex);

if (state->info && state->info->flags & UIF_INITIALIZED) {
struct uart_ops *ops = port->ops;
const struct uart_ops *ops = port->ops;

spin_lock_irq(&port->lock);
ops->stop_tx(port);
Expand Down Expand Up @@ -1932,7 +1932,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
}

if (state->info && state->info->flags & UIF_INITIALIZED) {
struct uart_ops *ops = port->ops;
const struct uart_ops *ops = port->ops;
int ret;

ops->set_mctrl(port, 0);
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/serial_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ struct uart_port {
unsigned int mctrl; /* current modem ctrl settings */
unsigned int timeout; /* character-based timeout */
unsigned int type; /* port type */
struct uart_ops *ops;
const struct uart_ops *ops;
unsigned int custom_divisor;
unsigned int line; /* port index */
unsigned long mapbase; /* for ioremap */
Expand Down

0 comments on commit 7f8b7bb

Please sign in to comment.