Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: serial: cyberjack: 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>
Cc: <support@reiner-sct.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+11 -6
+11 -6
drivers/usb/serial/cyberjack.c
··· 305 305 struct usb_serial_port *port = (struct usb_serial_port *)urb->context; 306 306 struct cyberjack_private *priv = usb_get_serial_port_data(port); 307 307 unsigned char *data = urb->transfer_buffer; 308 + int status = urb->status; 308 309 int result; 309 310 310 311 dbg("%s - port %d", __FUNCTION__, port->number); 311 312 312 313 /* the urb might have been killed. */ 313 - if (urb->status) 314 + if (status) 314 315 return; 315 316 316 317 usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data); ··· 366 365 unsigned char *data = urb->transfer_buffer; 367 366 short todo; 368 367 int result; 368 + int status = urb->status; 369 369 370 370 dbg("%s - port %d", __FUNCTION__, port->number); 371 - 371 + 372 372 usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data); 373 - if (urb->status) { 374 - dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status); 373 + if (status) { 374 + dbg("%s - nonzero read bulk status received: %d", 375 + __FUNCTION__, status); 375 376 return; 376 377 } 377 378 ··· 414 411 { 415 412 struct usb_serial_port *port = (struct usb_serial_port *)urb->context; 416 413 struct cyberjack_private *priv = usb_get_serial_port_data(port); 414 + int status = urb->status; 417 415 418 416 dbg("%s - port %d", __FUNCTION__, port->number); 419 417 420 418 port->write_urb_busy = 0; 421 - if (urb->status) { 422 - dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); 419 + if (status) { 420 + dbg("%s - nonzero write bulk status received: %d", 421 + __FUNCTION__, status); 423 422 return; 424 423 } 425 424