From 4554c33c5cb02ddb88487aeb1abcb2bc2dde73ec Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 May 2012 16:44:20 -0700 Subject: [PATCH] --- yaml --- r: 303737 b: refs/heads/master c: b97835556f635d117243bd54404d8190ce95d09b h: refs/heads/master i: 303735: 16a36b5c9c6fcc72d78dcd4b71698444c1903b08 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ir-usb.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 770b765d5c57..7d2fefb425ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ae4c01ed5a8041ffa12b90dbe6e0465653d3a5a +refs/heads/master: b97835556f635d117243bd54404d8190ce95d09b diff --git a/trunk/drivers/usb/serial/ir-usb.c b/trunk/drivers/usb/serial/ir-usb.c index 84965cd65c76..ea09cf7044d7 100644 --- a/trunk/drivers/usb/serial/ir-usb.c +++ b/trunk/drivers/usb/serial/ir-usb.c @@ -264,8 +264,6 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port) { int i; - dbg("%s - port %d", __func__, port->number); - for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i) port->write_urbs[i]->transfer_flags = URB_ZERO_PACKET; @@ -322,15 +320,10 @@ static void ir_process_read_urb(struct urb *urb) static void ir_set_termios_callback(struct urb *urb) { - struct usb_serial_port *port = urb->context; - int status = urb->status; - - dbg("%s - port %d", __func__, port->number); - kfree(urb->transfer_buffer); - if (status) - dbg("%s - non-zero urb status: %d", __func__, status); + if (urb->status) + dbg("%s - non-zero urb status: %d", __func__, urb->status); } static void ir_set_termios(struct tty_struct *tty, @@ -342,8 +335,6 @@ static void ir_set_termios(struct tty_struct *tty, speed_t baud; int ir_baud; - dbg("%s - port %d", __func__, port->number); - baud = tty_get_baud_rate(tty); /*