Merge 3.8-rc5 into tty-next

[deliverable/linux.git] / drivers / tty / serial / ifx6x60.c

diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 8cb6d8d66a1362b1b2f5566a875c1f56248a3b29..68d7ce997ede999fce550d0b6d1ccd6d0e9032be 100644 (file)
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -481,7 +481,6 @@ static int ifx_spi_prepare_tx_buffer(struct ifx_spi_device *ifx_dev)
        unsigned char *tx_buffer;
 
        tx_buffer = ifx_dev->tx_buffer;
-       memset(tx_buffer, 0, IFX_SPI_TRANSFER_SIZE);
 
        /* make room for required SPI header */
        tx_buffer += IFX_SPI_HEADER_OVERHEAD;
@@ -615,7 +614,7 @@ static int ifx_port_activate(struct tty_port *port, struct tty_struct *tty)
        tty->driver_data = ifx_dev;
 
        /* allows flip string push from int context */
-       tty->low_latency = 1;
+       port->low_latency = 1;
 
        /* set flag to allows data transfer */
        set_bit(IFX_SPI_STATE_IO_AVAILABLE, &ifx_dev->flags);
@@ -670,12 +669,8 @@ static const struct tty_operations ifx_spi_serial_ops = {
 static void ifx_spi_insert_flip_string(struct ifx_spi_device *ifx_dev,
                                    unsigned char *chars, size_t size)
 {
-       struct tty_struct *tty = tty_port_tty_get(&ifx_dev->tty_port);
-       if (!tty)
-               return;
-       tty_insert_flip_string(tty, chars, size);
-       tty_flip_buffer_push(tty);
-       tty_kref_put(tty);
+       tty_insert_flip_string(&ifx_dev->tty_port, chars, size);
+       tty_flip_buffer_push(&ifx_dev->tty_port);
 }
 
 /**