From 89305d79b5f73efccabbe5ec674b50727bc74584 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Fri, 27 May 2011 08:37:40 +0400 Subject: [PATCH] --- yaml --- r: 253294 b: refs/heads/master c: 3898115896c7f18cb7009de691c43cb3d92bb82a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/inode.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ac56500b46d..dbfffd13b2f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e8e62e4a5d26e4cb45f25dddd093837d75616c2 +refs/heads/master: 3898115896c7f18cb7009de691c43cb3d92bb82a diff --git a/trunk/drivers/usb/gadget/inode.c b/trunk/drivers/usb/gadget/inode.c index a01383f71f38..a56876aaf76c 100644 --- a/trunk/drivers/usb/gadget/inode.c +++ b/trunk/drivers/usb/gadget/inode.c @@ -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))