redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

USB: misc: iowarrior: 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.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
hifive-unleashed-5.1
Greg Kroah-Hartman 2007-07-18 10:58:02 -07:00
parent 84346269f9
commit fb3abee69d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/usb/misc/iowarrior.c
View File

@ -158,9 +158,10 @@ static void iowarrior_callback(struct urb *urb)
int read_idx; int read_idx;
int aux_idx; int aux_idx;
int offset; int offset;
int status; int status = urb->status;
int retval;
switch (urb->status) { switch (status) {
case 0: case 0:
/* success */ /* success */
break; break;
@ -213,10 +214,10 @@ static void iowarrior_callback(struct urb *urb)
wake_up_interruptible(&dev->read_wait); wake_up_interruptible(&dev->read_wait);
exit: exit:
status = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (status) if (retval)
dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d", dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d",
__FUNCTION__, status); __FUNCTION__, retval);
} }
@ -226,13 +227,15 @@ exit:
static void iowarrior_write_callback(struct urb *urb) static void iowarrior_write_callback(struct urb *urb)
{ {
struct iowarrior *dev; struct iowarrior *dev;
int status = urb->status;
dev = (struct iowarrior *)urb->context; dev = (struct iowarrior *)urb->context;
/* sync/async unlink faults aren't errors */ /* sync/async unlink faults aren't errors */
if (urb->status && if (status &&
!(urb->status == -ENOENT || !(status == -ENOENT ||
urb->status == -ECONNRESET || urb->status == -ESHUTDOWN)) { status == -ECONNRESET || status == -ESHUTDOWN)) {
dbg("%s - nonzero write bulk status received: %d", dbg("%s - nonzero write bulk status received: %d",
__func__, urb->status); __func__, status);
} }
/* free up our allocated buffer */ /* free up our allocated buffer */
usb_buffer_free(urb->dev, urb->transfer_buffer_length, usb_buffer_free(urb->dev, urb->transfer_buffer_length,