diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-29 05:27:48 +0200 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-29 05:27:48 +0200 |
commit | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (patch) | |
tree | 7b72b1fae85137435d5b98f4614df2195f612acc /drivers/usb | |
parent | Revert "Merge branch 'odirect'" (diff) | |
parent | Fix vsnprintf off-by-one bug (diff) | |
download | linux-9f2fa466383ce100b90fe52cb4489d7a26bf72a9.tar.xz linux-9f2fa466383ce100b90fe52cb4489d7a26bf72a9.zip |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/ir-usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 9432c7302275..d7f3f736a692 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c @@ -453,8 +453,7 @@ static void ir_read_bulk_callback (struct urb *urb, struct pt_regs *regs) tty = port->tty; /* - * FIXME: must not do this in IRQ context, - * must honour TTY_DONT_FLIP + * FIXME: must not do this in IRQ context */ tty->ldisc.receive_buf( tty, |