From: Johan Hovold Date: Sun, 6 Nov 2011 18:06:33 +0000 (+0100) Subject: USB: usb_debug: use process_read_urb X-Git-Tag: MMI-PSA29.97-13-9~17726^2~74 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac3695fb74f27ae36632bcc2d83c0f2c8c4a7ca2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git USB: usb_debug: use process_read_urb Use process_read_urb rather than read_bulk_callback for break processing. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index 51bb509219e0..9b632e753210 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)