diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:12:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:12:39 +0200 |
| commit | 92311e46ecf2298d87f175c8449ab4d8c400a38e (patch) | |
| tree | 92bfbbc23c3acfb035a88bf257849465b26aa156 /drivers/tty/serial/etraxfs-uart.c | |
| parent | pty: Add debug message for ptmx open (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | linux-92311e46ecf2298d87f175c8449ab4d8c400a38e.tar.xz linux-92311e46ecf2298d87f175c8449ab4d8c400a38e.zip | |
Merge 4.2-rc4 into tty-next
Other serial driver work wants to build on patches now in 4.2-rc4 so
merge the branch so this can properly happen.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/etraxfs-uart.c')
| -rw-r--r-- | drivers/tty/serial/etraxfs-uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/etraxfs-uart.c b/drivers/tty/serial/etraxfs-uart.c index 7444ca3e616b..72d89a8ff27e 100644 --- a/drivers/tty/serial/etraxfs-uart.c +++ b/drivers/tty/serial/etraxfs-uart.c @@ -943,7 +943,7 @@ static int etraxfs_uart_remove(struct platform_device *pdev) port = platform_get_drvdata(pdev); uart_remove_one_port(&etraxfs_uart_driver, port); - etraxfs_uart_ports[pdev->id] = NULL; + etraxfs_uart_ports[port->line] = NULL; return 0; } |