diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:11:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:11:21 +0200 |
| commit | b53761e36a509609e91a797fa63648ec43aecc13 (patch) | |
| tree | 4bbb955440c7eeac562a2abc6046c60255943cbb /drivers/tty/serial/8250/8250_core.c | |
| parent | d2f5a7311bcaed681a41cb3419b8fe92a7b68bf5 (diff) | |
| parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
| download | blackbird-op-linux-b53761e36a509609e91a797fa63648ec43aecc13.tar.gz blackbird-op-linux-b53761e36a509609e91a797fa63648ec43aecc13.zip | |
Merge 4.8-rc5 into tty-next
We want the fixes in here for merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_core.c')
| -rw-r--r-- | drivers/tty/serial/8250/8250_core.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index f64d6cd311ed..240a361b674f 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -974,8 +974,6 @@ int serial8250_register_8250_port(struct uart_8250_port *up) uart = serial8250_find_match_or_unused(&up->port); if (uart && uart->port.type != PORT_8250_CIR) { - struct mctrl_gpios *gpios; - if (uart->port.dev) uart_remove_one_port(&serial8250_reg, &uart->port); @@ -1013,13 +1011,6 @@ int serial8250_register_8250_port(struct uart_8250_port *up) if (up->port.flags & UPF_FIXED_TYPE) uart->port.type = up->port.type; - gpios = mctrl_gpio_init(&uart->port, 0); - if (IS_ERR(gpios)) { - if (PTR_ERR(gpios) != -ENOSYS) - return PTR_ERR(gpios); - } else - uart->gpios = gpios; - serial8250_set_defaults(uart); /* Possibly override default I/O functions. */ |
