Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (149 commits)
  USB: ohci-pnx4008: Remove unnecessary cast of return value of kzalloc
  USB: additions to the quirk list
  usb-storage: implement autosuspend
  USB: cdc-acm: add new device id to option driver
  USB: goku_udc trivial cleanups
  USB: usb gadget stack can now -DDEBUG with Kconfig
  usb gadget stack: remove usb_ep_*_buffer(), part 2
  usb gadget stack: remove usb_ep_*_buffer(), part 1
  USB: pxa2xx_udc -- cleanups, mostly removing dma hooks
  USB: pxa2xx_udc: use generic gpio layer
  USB: quirk for samsung printer
  USB: usb/dma doc updates
  USB: drivers/usb/storage/unusual_devs.h whitespace cleanup
  USB: remove Makefile reference to obsolete OHCI_AT91
  USB: io_*: remove bogus termios no change checks
  USB: mos7720: remove bogus no termios change check
  USB: visor and whiteheat: remove bogus termios change checks
  USB: pl2303: remove bogus checks and fix speed support to use tty_get_baud_rate()
  USB: mos7840.c: turn this into a serial driver
  USB: make the usb_device numa_node get assigned from controller
  ...

1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 4167753ed31f..4353df92487f 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -305,12 +305,13 @@ static void cyberjack_read_int_callback( struct urb *urb )
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
         struct cyberjack_private *priv = usb_get_serial_port_data(port);
         unsigned char *data = urb->transfer_buffer;
+        int status = urb->status;
         int result;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
         /* the urb might have been killed. */
-        if (urb->status)
+        if (status)
                 return;
 
         usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
@@ -365,12 +366,14 @@ static void cyberjack_read_bulk_callback (struct urb *urb)
         unsigned char *data = urb->transfer_buffer;
         short todo;
         int result;
+        int status = urb->status;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
-        
+
         usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
-        if (urb->status) {
-                dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status);
+        if (status) {
+                dbg("%s - nonzero read bulk status received: %d",
+                    __FUNCTION__, status);
                 return;
         }
 
@@ -411,12 +414,14 @@ static void cyberjack_write_bulk_callback (struct urb *urb)
 {
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
         struct cyberjack_private *priv = usb_get_serial_port_data(port);
+        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;
         }