Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61952
b: refs/heads/master
c: 24497a0
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jul 20, 2007
1 parent b28b183 commit a667e96
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 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: 3fc3e8269fa5c1f35b518dbe18dc48acef3c7684
refs/heads/master: 24497a00114ef42a752d614635168db9e2192f5e
24 changes: 13 additions & 11 deletions trunk/drivers/usb/misc/adutux.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,18 @@ static void adu_delete(struct adu_device *dev)
static void adu_interrupt_in_callback(struct urb *urb)
{
struct adu_device *dev = urb->context;
int status = urb->status;

dbg(4," %s : enter, status %d", __FUNCTION__, urb->status);
dbg(4," %s : enter, status %d", __FUNCTION__, status);
adu_debug_data(5, __FUNCTION__, urb->actual_length,
urb->transfer_buffer);

spin_lock(&dev->buflock);

if (urb->status != 0) {
if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET)) {
if (status != 0) {
if ((status != -ENOENT) && (status != -ECONNRESET)) {
dbg(1," %s : nonzero status received: %d",
__FUNCTION__, urb->status);
__FUNCTION__, status);
}
goto exit;
}
Expand Down Expand Up @@ -217,21 +218,22 @@ static void adu_interrupt_in_callback(struct urb *urb)
wake_up_interruptible(&dev->read_wait);
adu_debug_data(5, __FUNCTION__, urb->actual_length,
urb->transfer_buffer);
dbg(4," %s : leave, status %d", __FUNCTION__, urb->status);
dbg(4," %s : leave, status %d", __FUNCTION__, status);
}

static void adu_interrupt_out_callback(struct urb *urb)
{
struct adu_device *dev = urb->context;
int status = urb->status;

dbg(4," %s : enter, status %d", __FUNCTION__, urb->status);
dbg(4," %s : enter, status %d", __FUNCTION__, status);
adu_debug_data(5,__FUNCTION__, urb->actual_length, urb->transfer_buffer);

if (urb->status != 0) {
if ((urb->status != -ENOENT) &&
(urb->status != -ECONNRESET)) {
if (status != 0) {
if ((status != -ENOENT) &&
(status != -ECONNRESET)) {
dbg(1, " %s :nonzero status received: %d",
__FUNCTION__, urb->status);
__FUNCTION__, status);
}
goto exit;
}
Expand All @@ -241,7 +243,7 @@ static void adu_interrupt_out_callback(struct urb *urb)

adu_debug_data(5, __FUNCTION__, urb->actual_length,
urb->transfer_buffer);
dbg(4," %s : leave, status %d", __FUNCTION__, urb->status);
dbg(4," %s : leave, status %d", __FUNCTION__, status);
}

static int adu_open(struct inode *inode, struct file *file)
Expand Down

0 comments on commit a667e96

Please sign in to comment.