lkml.org 
[lkml]   [2014]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] usb: gadget: f_fs: add missing spinlock and mutex unlock
On Mon, Mar 10, 2014 at 09:33:37AM +0100, Robert Baldyga wrote:
> This patch adds missing spin_unlock and mutex_unlock calls in
> error handling code.
>
> Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
> Acked-by: Michal Nazarewicz <mina86@mina86.com>
> Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> drivers/usb/gadget/f_fs.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
> index b7d273a..d6bd0a3 100644
> --- a/drivers/usb/gadget/f_fs.c
> +++ b/drivers/usb/gadget/f_fs.c
> @@ -802,7 +802,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
> if (io_data->aio) {
> req = usb_ep_alloc_request(ep->ep, GFP_KERNEL);
> if (unlikely(!req))
> - goto error;
> + goto error_lock;
>
> req->buf = data;
> req->length = io_data->len;
> @@ -817,7 +817,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
> ret = usb_ep_queue(ep->ep, req, GFP_ATOMIC);
> if (unlikely(ret)) {
> usb_ep_free_request(ep->ep, req);
> - goto error;
> + goto error_lock;
> }
> ret = -EIOCBQUEUED;
>
> @@ -863,6 +863,10 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
>
> mutex_unlock(&epfile->mutex);
> return ret;
> +
> +error_lock:
> + spin_unlock_irq(&epfile->ffs->eps_lock);
> + mutex_unlock(&epfile->mutex);
> error:
> kfree(data);
> return ret;
> --
> 1.7.9.5

This patch doesn't apply to my tree at all :(


\
 
 \ /
  Last update: 2014-03-18 00:21    [W:0.047 / U:0.536 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site