diff options
Diffstat (limited to 'drivers/mmc/card')
-rw-r--r-- | drivers/mmc/card/sdio_uart.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c index 2c151e18c9e8..5a2cbfac66d2 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) | |||
750 | { | 750 | { |
751 | int idx = tty->index; | 751 | int idx = tty->index; |
752 | struct sdio_uart_port *port = sdio_uart_port_get(idx); | 752 | struct sdio_uart_port *port = sdio_uart_port_get(idx); |
753 | int ret = tty_init_termios(tty); | 753 | int ret = tty_standard_install(driver, tty); |
754 | 754 | ||
755 | if (ret == 0) { | 755 | if (ret == 0) |
756 | tty_driver_kref_get(driver); | ||
757 | tty->count++; | ||
758 | /* This is the ref sdio_uart_port get provided */ | 756 | /* This is the ref sdio_uart_port get provided */ |
759 | tty->driver_data = port; | 757 | tty->driver_data = port; |
760 | driver->ttys[idx] = tty; | 758 | else |
761 | } else | ||
762 | sdio_uart_port_put(port); | 759 | sdio_uart_port_put(port); |
763 | return ret; | 760 | return ret; |
764 | } | 761 | } |
@@ -1178,7 +1175,6 @@ static int __init sdio_uart_init(void) | |||
1178 | if (!tty_drv) | 1175 | if (!tty_drv) |
1179 | return -ENOMEM; | 1176 | return -ENOMEM; |
1180 | 1177 | ||
1181 | tty_drv->owner = THIS_MODULE; | ||
1182 | tty_drv->driver_name = "sdio_uart"; | 1178 | tty_drv->driver_name = "sdio_uart"; |
1183 | tty_drv->name = "ttySDIO"; | 1179 | tty_drv->name = "ttySDIO"; |
1184 | tty_drv->major = 0; /* dynamically allocated */ | 1180 | tty_drv->major = 0; /* dynamically allocated */ |