mdm6600: Don't panic on wrong port.
authorNick Pelly <npelly@google.com>
Fri, 20 Aug 2010 02:27:10 +0000 (19:27 -0700)
committerColin Cross <ccross@android.com>
Wed, 6 Oct 2010 23:33:40 +0000 (16:33 -0700)
Lack of power management on the mdm6600 driver causes it to sometimes
open with a bad port after USB re-unemeration. WARN_ON_ONCE instead of
BUG_ON.

Change-Id: Iae6c7aa2c1f2b30ff879a1b744a5efeef01664f9
Signed-off-by: Nick Pelly <npelly@google.com>
drivers/usb/serial/mdm6600.c

index 6b03d86f4d044160b6079071d45e6e4e775c14a9..3a1f32db30c475d0f5104bfbc94faf8ecd52d299 100644 (file)
@@ -227,12 +227,12 @@ static int mdm6600_open(struct tty_struct *tty, struct usb_serial_port *port)
 
        dbg("%s: port %d", __func__, port->number);
 
-       BUG_ON(modem->port != port);
+       WARN_ON_ONCE(modem->port != port);
 
        modem->tiocm_status = 0;
 
        if (port->number == MODEM_INTERFACE_NUM) {
-               BUG_ON(!port->interrupt_in_urb);
+               WARN_ON_ONCE(!port->interrupt_in_urb);
                rc = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
                if (rc) {
                        dev_err(&port->dev,