diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:23:43 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:25:27 -0800 |
| commit | 5a22e30def8b9539576ff047adb14455ca559f07 (patch) | |
| tree | e1e76efd73b28e7ae8124383c263fcf92bcc11e0 /drivers/mmc | |
| parent | 19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a (diff) | |
| parent | 418a936e84e8f346da322c2e839992aa9df108d4 (diff) | |
| download | op-kernel-dev-5a22e30def8b9539576ff047adb14455ca559f07.zip op-kernel-dev-5a22e30def8b9539576ff047adb14455ca559f07.tar.gz | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/sdio_uart.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c index 2c151e1..bd4a67c 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; } |
