Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 188773
b: refs/heads/master
c: d855fe2
h: refs/heads/master
i:
  188771: 505607d
v: v3
  • Loading branch information
Oliver Neukum authored and Greg Kroah-Hartman committed Mar 19, 2010
1 parent d9ac420 commit 7a69d5d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition 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: 922a5eadd5a3aa0b806be0c18694b618d41d0784
refs/heads/master: d855fe2e9c19edaa47baba0e7f95e17f7a24dba8
5 changes: 0 additions & 5 deletions trunk/drivers/usb/class/cdc-wdm.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,8 @@ static ssize_t wdm_read
spin_lock_irq(&desc->iuspin);

if (desc->rerr) { /* read completed, error happened */
int t = desc->rerr;
desc->rerr = 0;
spin_unlock_irq(&desc->iuspin);
dev_err(&desc->intf->dev,
"reading had resulted in %d\n", t);
rv = -EIO;
goto err;
}
Expand Down Expand Up @@ -477,8 +474,6 @@ static ssize_t wdm_read

err:
mutex_unlock(&desc->lock);
if (rv < 0 && rv != -EAGAIN)
dev_err(&desc->intf->dev, "wdm_read: exit error\n");
return rv;
}

Expand Down

0 comments on commit 7a69d5d

Please sign in to comment.