usb: cdc-acm: move ldisc dcd notification outside of acm's read lock

[linux-2.6-microblaze.git] / drivers / usb / class / cdc-acm.c

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 9b34199..dfb28c7 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -319,23 +319,24 @@ static void acm_process_notification(struct acm *acm, unsigned char *buf)
                }
 
                difference = acm->ctrlin ^ newctrl;
+
+               if ((difference & USB_CDC_SERIAL_STATE_DCD) && acm->port.tty) {
+                       struct tty_ldisc *ld = tty_ldisc_ref(acm->port.tty);
+                       if (ld) {
+                               if (ld->ops->dcd_change)
+                                       ld->ops->dcd_change(acm->port.tty, newctrl & USB_CDC_SERIAL_STATE_DCD);
+                               tty_ldisc_deref(ld);
+                       }
+               }
+
                spin_lock_irqsave(&acm->read_lock, flags);
                acm->ctrlin = newctrl;
                acm->oldcount = acm->iocount;
 
                if (difference & USB_CDC_SERIAL_STATE_DSR)
                        acm->iocount.dsr++;
-               if (difference & USB_CDC_SERIAL_STATE_DCD) {
-                       if (acm->port.tty) {
-                               struct tty_ldisc *ld = tty_ldisc_ref(acm->port.tty);
-                               if (ld) {
-                                       if (ld->ops->dcd_change)
-                                               ld->ops->dcd_change(acm->port.tty, newctrl & USB_CDC_SERIAL_STATE_DCD);
-                                       tty_ldisc_deref(ld);
-                               }
-                       }
+               if (difference & USB_CDC_SERIAL_STATE_DCD)
                        acm->iocount.dcd++;
-               }
                if (newctrl & USB_CDC_SERIAL_STATE_BREAK) {
                        acm->iocount.brk++;
                        tty_insert_flip_char(&acm->port, 0, TTY_BREAK);