diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 13:55:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 13:55:31 -0700 |
| commit | 2637d139fb9a1bd428a003b7671fda40a034854f (patch) | |
| tree | 7983e0776c95990a545f83275682614e16a71167 /drivers/usb/serial/pl2303.c | |
| parent | 494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b (diff) | |
| parent | 288933c02b440621d9c8e7bb5f232cfb7bdef7df (diff) | |
| download | kernel_samsung_smdk4412-2637d139fb9a1bd428a003b7671fda40a034854f.zip kernel_samsung_smdk4412-2637d139fb9a1bd428a003b7671fda40a034854f.tar.gz kernel_samsung_smdk4412-2637d139fb9a1bd428a003b7671fda40a034854f.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()
Input: mousedev - fix regression of inverting axes
Input: uinput - add devname alias to allow module on-demand load
Input: hil_kbd - fix compile error
USB: drop tty argument from usb_serial_handle_sysrq_char()
Input: sysrq - drop tty argument form handle_sysrq()
Input: sysrq - drop tty argument from sysrq ops handlers
Diffstat (limited to 'drivers/usb/serial/pl2303.c')
| -rw-r--r-- | drivers/usb/serial/pl2303.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index c98f0fb..8ae4c6c 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c @@ -789,7 +789,7 @@ static void pl2303_process_read_urb(struct urb *urb) if (port->port.console && port->sysrq) { for (i = 0; i < urb->actual_length; ++i) - if (!usb_serial_handle_sysrq_char(tty, port, data[i])) + if (!usb_serial_handle_sysrq_char(port, data[i])) tty_insert_flip_char(tty, data[i], tty_flag); } else { tty_insert_flip_string_fixed_flag(tty, data, tty_flag, |