diff options
author | Johan Hovold <jhovold@gmail.com> | 2011-11-06 19:06:33 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-15 10:40:30 -0800 |
commit | ac3695fb74f27ae36632bcc2d83c0f2c8c4a7ca2 (patch) | |
tree | 331f351bda9e8429afe4ce5eadfc75093f2b45b4 | |
parent | e63aa508f20283b49cfdc47018455778690800cd (diff) | |
download | op-kernel-dev-ac3695fb74f27ae36632bcc2d83c0f2c8c4a7ca2.zip op-kernel-dev-ac3695fb74f27ae36632bcc2d83c0f2c8c4a7ca2.tar.gz |
USB: usb_debug: use process_read_urb
Use process_read_urb rather than read_bulk_callback for break
processing.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/serial/usb_debug.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index 51bb509..9b632e7 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c @@ -54,7 +54,7 @@ static void usb_debug_break_ctl(struct tty_struct *tty, int break_state) usb_serial_generic_write(tty, port, USB_DEBUG_BRK, USB_DEBUG_BRK_SIZE); } -static void usb_debug_read_bulk_callback(struct urb *urb) +static void usb_debug_process_read_urb(struct urb *urb) { struct usb_serial_port *port = urb->context; @@ -62,11 +62,10 @@ static void usb_debug_read_bulk_callback(struct urb *urb) memcmp(urb->transfer_buffer, USB_DEBUG_BRK, USB_DEBUG_BRK_SIZE) == 0) { usb_serial_handle_break(port); - usb_serial_generic_submit_read_urb(port, GFP_ATOMIC); return; } - usb_serial_generic_read_bulk_callback(urb); + usb_serial_generic_process_read_urb(urb); } static struct usb_serial_driver debug_device = { @@ -79,7 +78,7 @@ static struct usb_serial_driver debug_device = { .num_ports = 1, .bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE, .break_ctl = usb_debug_break_ctl, - .read_bulk_callback = usb_debug_read_bulk_callback, + .process_read_urb = usb_debug_process_read_urb, }; static int __init debug_init(void) |