USB: serial: remove unnecessary reinitialisations of urb->dev
Remove unnecessary reinitialisations of urb->dev before each submission, which were based on the (no longer valid) assumption that serial->dev will be set to NULL on close. Compile-only tested. Cc: Matthias Bruestle and Harald Welte <support@reiner-sct.com> Cc: Lonnie Mendez <dignome@gmail.com> Cc: Peter Berger <pberger@brimson.com> Cc: Al Borchers <alborchers@steinerpoint.com> Cc: Support Department <support@connecttech.com> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
016af7ec49
commit
5833041f1b
@@ -1770,12 +1770,11 @@ static void edge_bulk_in_callback(struct urb *urb)
|
||||
exit:
|
||||
/* continue read unless stopped */
|
||||
spin_lock(&edge_port->ep_lock);
|
||||
if (edge_port->ep_read_urb_state == EDGE_READ_URB_RUNNING) {
|
||||
urb->dev = edge_port->port->serial->dev;
|
||||
if (edge_port->ep_read_urb_state == EDGE_READ_URB_RUNNING)
|
||||
retval = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
} else if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPING) {
|
||||
else if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPING)
|
||||
edge_port->ep_read_urb_state = EDGE_READ_URB_STOPPED;
|
||||
}
|
||||
|
||||
spin_unlock(&edge_port->ep_lock);
|
||||
if (retval)
|
||||
dev_err(&urb->dev->dev,
|
||||
@@ -1954,7 +1953,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
|
||||
}
|
||||
urb->complete = edge_interrupt_callback;
|
||||
urb->context = edge_serial;
|
||||
urb->dev = dev;
|
||||
status = usb_submit_urb(urb, GFP_KERNEL);
|
||||
if (status) {
|
||||
dev_err(&port->dev,
|
||||
@@ -1982,7 +1980,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
|
||||
edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
|
||||
urb->complete = edge_bulk_in_callback;
|
||||
urb->context = edge_port;
|
||||
urb->dev = dev;
|
||||
status = usb_submit_urb(urb, GFP_KERNEL);
|
||||
if (status) {
|
||||
dev_err(&port->dev,
|
||||
@@ -2262,7 +2259,6 @@ static int restart_read(struct edgeport_port *edge_port)
|
||||
urb = edge_port->port->read_urb;
|
||||
urb->complete = edge_bulk_in_callback;
|
||||
urb->context = edge_port;
|
||||
urb->dev = edge_port->port->serial->dev;
|
||||
status = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
}
|
||||
edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
|
||||
|
Reference in New Issue
Block a user