diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
| commit | c19ae9c2483f0253bb58d3d3c28ac20386df6066 (patch) | |
| tree | 9e3339fd0c9ac3285839626b25bb8d30bea60abd /drivers/usb/core/devio.c | |
| parent | 836f44a71d886bc81551597612e3b1797133985f (diff) | |
| parent | b2824f4e0990716407b0c0e7acee75bb6353febf (diff) | |
| download | linux-linaro-tracking-with-fixes-c19ae9c2483f0253bb58d3d3c28ac20386df6066.tar.gz | |
Automatically merging tracking-linux-3.6.y into merge-linux-linaro-core-3.6linux-linaro-core-3.6-20121220.0linux-linaro-core-3.6
Conflicting files:
Diffstat (limited to 'drivers/usb/core/devio.c')
| -rw-r--r-- | drivers/usb/core/devio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index ebb8a9de8b5..7f75343a15b 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -1348,6 +1348,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, ret = -EFAULT; goto error; } + uurb->buffer += u; } totlen -= u; } |