1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index f5033d482eee..38726ef3132b 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -658,11 +658,14 @@ static void whiteheat_close(struct usb_serial_port *port, struct file * filp)
         struct list_head *tmp2;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
-        
+
+        mutex_lock(&port->serial->disc_mutex);
         /* filp is NULL when called from usb_serial_disconnect */
-        if (filp && (tty_hung_up_p(filp))) {
+        if ((filp && (tty_hung_up_p(filp))) || port->serial->disconnected) {
+                mutex_unlock(&port->serial->disc_mutex);
                 return;
         }
+        mutex_unlock(&port->serial->disc_mutex);
 
         port->tty->closing = 1;