diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
commit | 8058e14259ddc8c1824387198fc53700ed4cccc9 (patch) | |
tree | faffb83ca5173e5f3cbfd4170de603ada4812e23 /drivers/usb/serial/io_ti.c | |
parent | 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff) | |
parent | 7da58046482fceb17c4a0d4afefd9507ec56de7f (diff) | |
download | op-kernel-dev-8058e14259ddc8c1824387198fc53700ed4cccc9.zip op-kernel-dev-8058e14259ddc8c1824387198fc53700ed4cccc9.tar.gz |
Merge branch 'usb-audio-fix' of git://git.alsa-project.org/alsa-kprivate into for-linus
Diffstat (limited to 'drivers/usb/serial/io_ti.c')
-rw-r--r-- | drivers/usb/serial/io_ti.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 58184f3..82afc4d 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c @@ -530,6 +530,9 @@ static void chase_port(struct edgeport_port *port, unsigned long timeout, wait_queue_t wait; unsigned long flags; + if (!tty) + return; + if (!timeout) timeout = (HZ * EDGE_CLOSING_WAIT)/100; |