tty: usb-serial krefs

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / keyspan_pda.c

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index b60012ce4c91237e1d82846686d03d181e5901e5..99e9a14c5bf65979ddfb2de5c03dc2c50e1b8968 100644 (file)
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -172,8 +172,9 @@ static void keyspan_pda_wakeup_write(struct work_struct *work)
        struct keyspan_pda_private *priv =
                container_of(work, struct keyspan_pda_private, wakeup_work);
        struct usb_serial_port *port = priv->port;
-
-       tty_wakeup(port->port.tty);
+       struct tty_struct *tty = tty_port_tty_get(&port->port);
+       tty_wakeup(tty);
+       tty_kref_put(tty);
 }
 
 static void keyspan_pda_request_unthrottle(struct work_struct *work)
@@ -205,9 +206,8 @@ static void keyspan_pda_request_unthrottle(struct work_struct *work)
 static void keyspan_pda_rx_interrupt(struct urb *urb)
 {
        struct usb_serial_port *port = urb->context;
-       struct tty_struct *tty = port->port.tty;
+       struct tty_struct *tty = tty_port_tty_get(&port->port);
        unsigned char *data = urb->transfer_buffer;
-       int i;
        int retval;
        int status = urb->status;
        struct keyspan_pda_private *priv;
@@ -223,7 +223,7 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
                /* this urb is terminated, clean up */
                dbg("%s - urb shutting down with status: %d",
                    __func__, status);
-               return;
+               goto out;
        default:
                dbg("%s - nonzero urb status received: %d",
                    __func__, status);
@@ -235,8 +235,8 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
        case 0:
                /* rest of message is rx data */
                if (urb->actual_length) {
-                       for (i = 1; i < urb->actual_length ; ++i)
-                               tty_insert_flip_char(tty, data[i], 0);
+                       tty_insert_flip_string(tty, data + 1,
+                                               urb->actual_length - 1);
                        tty_flip_buffer_push(tty);
                }
                break;
@@ -262,8 +262,11 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
 exit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
-               err("%s - usb_submit_urb failed with result %d",
-                    __func__, retval);
+               dev_err(&port->dev,
+                       "%s - usb_submit_urb failed with result %d",
+                       __func__, retval);
+out:
+       tty_kref_put(tty);                   
 }