Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[cascardo/linux.git] / drivers / usb / serial / garmin_gps.c

diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 203358d..1a07b12 100644 (file)
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -252,14 +252,11 @@ static inline int isAbortTrfCmnd(const unsigned char *buf)
 static void send_to_tty(struct usb_serial_port *port,
                        char *data, unsigned int actual_length)
 {
-       struct tty_struct *tty = tty_port_tty_get(&port->port);
-
-       if (tty && actual_length) {
+       if (actual_length) {
                usb_serial_debug_data(&port->dev, __func__, actual_length, data);
-               tty_insert_flip_string(tty, data, actual_length);
-               tty_flip_buffer_push(tty);
+               tty_insert_flip_string(&port->port, data, actual_length);
+               tty_flip_buffer_push(&port->port);
        }
-       tty_kref_put(tty);
 }