diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-04 20:03:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-04 20:03:20 +0100 |
| commit | 4d4bac4499e9955521af80198063ef9c2f2bd634 (patch) | |
| tree | b02fb1f3d343d3a4a9864be18eec04e10f43d410 /drivers/usb/musb/musb_debugfs.c | |
| parent | usb: Retry port status check on resume to work around RH bugs (diff) | |
| parent | usb: musb: fix device hotplug behind hub (diff) | |
| download | linux-4d4bac4499e9955521af80198063ef9c2f2bd634.tar.xz linux-4d4bac4499e9955521af80198063ef9c2f2bd634.zip | |
Merge tag 'usb-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.20 merge window
Here's the big pull request for Gadgets and PHYs. It's
a total of 217 non-merge commits with pretty much everything
being touched.
The most important bits are a ton of new documentation for
almost all usb gadget functions, a new isp1760 UDC driver,
several improvements to the old net2280 UDC driver, and
some minor tracepoint improvements to dwc3.
Other than that, a big list of minor cleanups, smaller bugfixes
and new features all over the place.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/musb_debugfs.c')
| -rw-r--r-- | drivers/usb/musb/musb_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index 48131aa8472c..78a283e9ce40 100644 --- a/drivers/usb/musb/musb_debugfs.c +++ b/drivers/usb/musb/musb_debugfs.c @@ -196,7 +196,7 @@ static ssize_t musb_test_mode_write(struct file *file, memset(buf, 0x00, sizeof(buf)); - if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) + if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; if (strstarts(buf, "force host")) |