lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: misc: ldusb: clean up urb->status usage

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2007-07-18 10:58:02 -07:00
parent fb3abee69d
commit 491c021e0b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/usb/misc/ldusb.c
View File

@@ -219,16 +219,17 @@ static void ld_usb_interrupt_in_callback(struct urb *urb)
struct ld_usb *dev = urb->context; struct ld_usb *dev = urb->context;
size_t *actual_buffer; size_t *actual_buffer;
unsigned int next_ring_head; unsigned int next_ring_head;
int status = urb->status;
int retval; int retval;
if (urb->status) { if (status) {
if (urb->status == -ENOENT || if (status == -ENOENT ||
urb->status == -ECONNRESET || status == -ECONNRESET ||
urb->status == -ESHUTDOWN) { status == -ESHUTDOWN) {
goto exit; goto exit;
} else { } else {
dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n",
__FUNCTION__, urb->status); __FUNCTION__, status);
spin_lock(&dev->rbsl); spin_lock(&dev->rbsl);
goto resubmit; /* maybe we can recover */ goto resubmit; /* maybe we can recover */
} }
@@ -275,14 +276,15 @@ exit:
static void ld_usb_interrupt_out_callback(struct urb *urb) static void ld_usb_interrupt_out_callback(struct urb *urb)
{ {
struct ld_usb *dev = urb->context; struct ld_usb *dev = urb->context;
int status = urb->status;
/* sync/async unlink faults aren't errors */ /* sync/async unlink faults aren't errors */
if (urb->status && !(urb->status == -ENOENT || if (status && !(status == -ENOENT ||
urb->status == -ECONNRESET || status == -ECONNRESET ||
urb->status == -ESHUTDOWN)) status == -ESHUTDOWN))
dbg_info(&dev->intf->dev, dbg_info(&dev->intf->dev,
"%s - nonzero write interrupt status received: %d\n", "%s - nonzero write interrupt status received: %d\n",
__FUNCTION__, urb->status); __FUNCTION__, status);
dev->interrupt_out_busy = 0; dev->interrupt_out_busy = 0;
wake_up_interruptible(&dev->write_wait); wake_up_interruptible(&dev->write_wait);