Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61945
b: refs/heads/master
c: 33fea2b
h: refs/heads/master
i:
  61943: b61eb7e
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jul 20, 2007
1 parent df0dd6d commit c4ba7bb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 508330ebdacb3df07ee2a75aee8caf2c205befc8
refs/heads/master: 33fea2b2f523251d29619641451bfebdc35f4950
11 changes: 6 additions & 5 deletions trunk/drivers/usb/atm/usbatm.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@ static void usbatm_complete(struct urb *urb)
{
struct usbatm_channel *channel = urb->context;
unsigned long flags;
int status = urb->status;

vdbg("%s: urb 0x%p, status %d, actual_length %d",
__func__, urb, urb->status, urb->actual_length);
__func__, urb, status, urb->actual_length);

/* usually in_interrupt(), but not always */
spin_lock_irqsave(&channel->lock, flags);
Expand All @@ -269,16 +270,16 @@ static void usbatm_complete(struct urb *urb)

spin_unlock_irqrestore(&channel->lock, flags);

if (unlikely(urb->status) &&
if (unlikely(status) &&
(!(channel->usbatm->flags & UDSL_IGNORE_EILSEQ) ||
urb->status != -EILSEQ ))
status != -EILSEQ ))
{
if (urb->status == -ESHUTDOWN)
if (status == -ESHUTDOWN)
return;

if (printk_ratelimit())
atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n",
__func__, urb, urb->status);
__func__, urb, status);
/* throttle processing in case of an error */
mod_timer(&channel->delay, jiffies + msecs_to_jiffies(THROTTLE_MSECS));
} else
Expand Down

0 comments on commit c4ba7bb

Please sign in to comment.