Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd27225 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: serial: generic: clean up urb->status usage 



This done in anticipation of removal of urb->status, which will make
that patch easier to review and apply in the future.


Cc: <linux-usb-devel@lists.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f9feb517

drivers/usb/serial/generic.c

+8 −4
Original line number Diff line number Diff line
@@ -325,11 +325,13 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb) 
{

	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;

	unsigned char *data = urb->transfer_buffer;

	int status = urb->status;



	dbg("%s - port %d", __FUNCTION__, port->number);



	if (unlikely(urb->status != 0)) {

		dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status);

	if (unlikely(status != 0)) {

		dbg("%s - nonzero read bulk status received: %d",

		    __FUNCTION__, status);

		return;

	}
@@ -347,12 +349,14 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback); 
void usb_serial_generic_write_bulk_callback (struct urb *urb)

{

	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;

	int status = urb->status;



	dbg("%s - port %d", __FUNCTION__, port->number);



	port->write_urb_busy = 0;

	if (urb->status) {

		dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status);

	if (status) {

		dbg("%s - nonzero write bulk status received: %d",

		    __FUNCTION__, status);

		return;

	}