projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'driver-core-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
tty
/
serial
/
serial_core.c
diff --git
a/drivers/tty/serial/serial_core.c
b/drivers/tty/serial/serial_core.c
index
6e4f636
..
f2303f3
100644
(file)
--- a/
drivers/tty/serial/serial_core.c
+++ b/
drivers/tty/serial/serial_core.c
@@
-111,7
+111,7
@@
void uart_write_wakeup(struct uart_port *port)
* closed. No cookie for you.
*/
BUG_ON(!state);
* closed. No cookie for you.
*/
BUG_ON(!state);
- tty_
wakeup(state->port.tty
);
+ tty_
port_tty_wakeup(&state->port
);
}
static void uart_stop(struct tty_struct *tty)
}
static void uart_stop(struct tty_struct *tty)
@@
-632,7
+632,7
@@
static void uart_flush_buffer(struct tty_struct *tty)
if (port->ops->flush_buffer)
port->ops->flush_buffer(port);
uart_port_unlock(port, flags);
if (port->ops->flush_buffer)
port->ops->flush_buffer(port);
uart_port_unlock(port, flags);
- tty_
wakeup(tty
);
+ tty_
port_tty_wakeup(&state->port
);
}
/*
}
/*
@@
-2746,8
+2746,6
@@
int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
uport->cons = drv->cons;
uport->minor = drv->tty_driver->minor_start + uport->line;
uport->cons = drv->cons;
uport->minor = drv->tty_driver->minor_start + uport->line;
- port->console = uart_console(uport);
-
/*
* If this port is a console, then the spinlock is already
* initialised.
/*
* If this port is a console, then the spinlock is already
* initialised.
@@
-2761,6
+2759,8
@@
int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
uart_configure_port(drv, state, uport);
uart_configure_port(drv, state, uport);
+ port->console = uart_console(uport);
+
num_groups = 2;
if (uport->attr_group)
num_groups++;
num_groups = 2;
if (uport->attr_group)
num_groups++;