Commit 8a7471ab authored by Milan Svoboda's avatar Milan Svoboda Committed by Greg Kroah-Hartman

USB: fix ep_config to return correct value

This patch fixes ep_config to return correct value. Without patch
ep_config returns submitted lenght minus 4 on succes. With this
patch applied, whole submitted lenght is returned.

ep_config parses submitted data and if buffer starts with (int) 1
it is parsed, otherwise error is reported. Problem is that ep_config
returns size of buffer minus 4 on success. I think that size of buffer
should be returned instead, because there were no problems and
all data were processed.
Signed-off-by: default avatarMilan Svoboda <msvoboda@ra.rockwell.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 07cb7f23
...@@ -741,7 +741,7 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) ...@@ -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 ep_data *data = fd->private_data;
struct usb_ep *ep; struct usb_ep *ep;
u32 tag; u32 tag;
int value; int value, length = len;
if ((value = down_interruptible (&data->lock)) < 0) if ((value = down_interruptible (&data->lock)) < 0)
return value; return value;
...@@ -792,7 +792,6 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) ...@@ -792,7 +792,6 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
goto fail0; goto fail0;
} }
} }
value = len;
spin_lock_irq (&data->dev->lock); spin_lock_irq (&data->dev->lock);
if (data->dev->state == STATE_DEV_UNBOUND) { 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) ...@@ -822,8 +821,10 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
data->name); data->name);
data->state = STATE_EP_DEFER_ENABLE; data->state = STATE_EP_DEFER_ENABLE;
} }
if (value == 0) if (value == 0) {
fd->f_op = &ep_io_operations; fd->f_op = &ep_io_operations;
value = length;
}
gone: gone:
spin_unlock_irq (&data->dev->lock); spin_unlock_irq (&data->dev->lock);
if (value < 0) { if (value < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment