From 7f8b7bb469ca121cee8efb7fecdc49f740899021 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 21 Jan 2006 22:45:50 +0000 Subject: [PATCH] --- yaml --- r: 19103 b: refs/heads/master c: ba899dbc036d24ab6b45faf64e3648a268721cc9 h: refs/heads/master i: 19101: b9cf189487cfd1a556e09ce160ed1ed38786ca42 19099: 3231f558a17d156e735b0a7d003681f4801f913f 19095: 942861d412d2215c42fd37e98a8d73a341f47c94 19087: f28c3a631774351e5de34ffc9f38edb1485cc01a 19071: 052bce82f8db0bc3b40cf8d1541f4f524893fd85 v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 4 ++-- trunk/include/linux/serial_core.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b2e633490eff..e3c1f462d5a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca740803856f23dbc5b1872039291231bc131ecb +refs/heads/master: ba899dbc036d24ab6b45faf64e3648a268721cc9 diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index 943770470b9d..74142b731527 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/drivers/serial/serial_core.c @@ -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); @@ -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); diff --git a/trunk/include/linux/serial_core.h b/trunk/include/linux/serial_core.h index f3af47713a4e..b74ff34469b9 100644 --- a/trunk/include/linux/serial_core.h +++ b/trunk/include/linux/serial_core.h @@ -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 */