Merge tag 'tty-3.3-rc3' tty-next

This is needed to handle the 8250 file merge mess properly for future
patches.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index 2c151e18c9e8..bd4a67cdac3f 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -750,15 +750,12 @@ static int sdio_uart_install(struct tty_driver *driver, struct tty_struct *tty)
 {
         int idx = tty->index;
         struct sdio_uart_port *port = sdio_uart_port_get(idx);
-        int ret = tty_init_termios(tty);
+        int ret = tty_standard_install(driver, tty);
 
-        if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
+        if (ret == 0)
                 /* This is the ref sdio_uart_port get provided */
                 tty->driver_data = port;
-                driver->ttys[idx] = tty;
-        } else
+        else
                 sdio_uart_port_put(port);
         return ret;
 }