Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 253294
b: refs/heads/master
c: 3898115
h: refs/heads/master
v: v3
  • Loading branch information
Alexey Khoroshilov authored and Greg Kroah-Hartman committed Jun 6, 2011
1 parent 48b3641 commit 89305d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 7e8e62e4a5d26e4cb45f25dddd093837d75616c2
refs/heads/master: 3898115896c7f18cb7009de691c43cb3d92bb82a
4 changes: 3 additions & 1 deletion trunk/drivers/usb/gadget/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,10 @@ ep_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)

/* halt any endpoint by doing a "wrong direction" i/o call */
if (!usb_endpoint_dir_in(&data->desc)) {
if (usb_endpoint_xfer_isoc(&data->desc))
if (usb_endpoint_xfer_isoc(&data->desc)) {
mutex_unlock(&data->lock);
return -EINVAL;
}
DBG (data->dev, "%s halt\n", data->name);
spin_lock_irq (&data->dev->lock);
if (likely (data->ep != NULL))
Expand Down

0 comments on commit 89305d7

Please sign in to comment.