tty: usb-serial krefs

Use kref in the USB serial drivers so that we don't free tty structures
from under the URB receive handlers as has historically been the case if
you were unlucky. This also gives us a framework for general tty drivers to
use tty_port objects and refcount.

Contains two err->dev_err changes merged together to fix clashes in the
-next tree.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 3a9d14384a43..11c8b97a5177 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -1481,7 +1481,7 @@ static void rx_data_softint(struct work_struct *work)
         struct whiteheat_private *info =
                 container_of(work, struct whiteheat_private, rx_work);
         struct usb_serial_port *port = info->port;
-        struct tty_struct *tty = port->port.tty;
+        struct tty_struct *tty = tty_port_tty_get(&port->port);
         struct whiteheat_urb_wrap *wrap;
         struct urb *urb;
         unsigned long flags;
@@ -1493,7 +1493,7 @@ static void rx_data_softint(struct work_struct *work)
         spin_lock_irqsave(&info->lock, flags);
         if (info->flags & THROTTLED) {
                 spin_unlock_irqrestore(&info->lock, flags);
-                return;
+                goto out;
         }
 
         list_for_each_safe(tmp, tmp2, &info->rx_urb_q) {
@@ -1513,7 +1513,7 @@ static void rx_data_softint(struct work_struct *work)
                                 spin_unlock_irqrestore(&info->lock, flags);
                                 tty_flip_buffer_push(tty);
                                 schedule_work(&info->rx_work);
-                                return;
+                                goto out;
                         }
                         tty_insert_flip_string(tty, urb->transfer_buffer, len);
                         sent += len;
@@ -1536,6 +1536,8 @@ static void rx_data_softint(struct work_struct *work)
 
         if (sent)
                 tty_flip_buffer_push(tty);
+out:
+        tty_kref_put(tty);
 }