From b7b9a175bf14e3da3545fe6261cdf2873b5f0191 Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Mon, 26 Jun 2006 07:19:00 -0700 Subject: [PATCH] --- yaml --- r: 36398 b: refs/heads/master c: 8a7471aba19dc526978a03bfe2e3c122712b5900 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/inode.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8895e22526f8..7a5e4a1f6013 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07cb7f23d07aa4d197dbeb123eb9719c176190ee +refs/heads/master: 8a7471aba19dc526978a03bfe2e3c122712b5900 diff --git a/trunk/drivers/usb/gadget/inode.c b/trunk/drivers/usb/gadget/inode.c index da85732fa993..72c88aa94d5d 100644 --- a/trunk/drivers/usb/gadget/inode.c +++ b/trunk/drivers/usb/gadget/inode.c @@ -741,7 +741,7 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) struct ep_data *data = fd->private_data; struct usb_ep *ep; u32 tag; - int value; + int value, length = len; if ((value = down_interruptible (&data->lock)) < 0) return value; @@ -792,7 +792,6 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) goto fail0; } } - value = len; spin_lock_irq (&data->dev->lock); if (data->dev->state == STATE_DEV_UNBOUND) { @@ -822,8 +821,10 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) data->name); data->state = STATE_EP_DEFER_ENABLE; } - if (value == 0) + if (value == 0) { fd->f_op = &ep_io_operations; + value = length; + } gone: spin_unlock_irq (&data->dev->lock); if (value < 0) {