diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 18:58:47 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 19:36:40 +0300 |
| commit | 2bc75dbf14f8f3db56c1f546e65a90b5286614ad (patch) | |
| tree | 8dd5ea0e0f2241b624f975b8416d0654d21c4383 /drivers/usb/gadget/function/f_fs.c | |
| parent | ed1c7848dcadba2be07057e6810eb5825d0080d7 (diff) | |
| parent | f74875dc36135ebae82a8e005f4b7f52289d2c40 (diff) | |
| download | linux-2bc75dbf14f8f3db56c1f546e65a90b5286614ad.tar.xz | |
Merge branch 'depends/usb-fixes' into next/soc
This branch was merged into v4.4-rc5 and is needed for the
bcm2836 support. Merging it first to avoid large-scale backmerge
of rc5.
* depends/usb-fixes:
usb: dwc2: fix kernel oops during driver probe
usb: phy: mxs: add "fsl,imx6ul-usbphy" compatible string
usb: gadget: f_midi: fix leak on failed to enqueue out requests
usb: gadget: f_midi: Transmit data only when IN ep is enabled
usb: dwc2: make otg clk optional
usb: dwc2: Return errors from PHY
usb: dwc2: Make PHY optional
usb: renesas_usbhs: gadget: Fix NULL pointer dereference in usbhsg_ep_dequeue()
usb: kconfig: fix warning of select USB_OTG
usb: gadget: pxa27x: fix suspend callback
usb: gadget: functionfs: fix missing access_ok checks
usb: musb: USB_TI_CPPI41_DMA requires dmaengine support
Diffstat (limited to 'drivers/usb/gadget/function/f_fs.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index adc6d52efa46..cf43e9e18368 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -423,7 +423,7 @@ static ssize_t __ffs_ep0_read_events(struct ffs_data *ffs, char __user *buf, spin_unlock_irq(&ffs->ev.waitq.lock); mutex_unlock(&ffs->mutex); - return unlikely(__copy_to_user(buf, events, size)) ? -EFAULT : size; + return unlikely(copy_to_user(buf, events, size)) ? -EFAULT : size; } static ssize_t ffs_ep0_read(struct file *file, char __user *buf, @@ -513,7 +513,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, /* unlocks spinlock */ ret = __ffs_ep0_queue_wait(ffs, data, len); - if (likely(ret > 0) && unlikely(__copy_to_user(buf, data, len))) + if (likely(ret > 0) && unlikely(copy_to_user(buf, data, len))) ret = -EFAULT; goto done_mutex; @@ -3493,7 +3493,7 @@ static char *ffs_prepare_buffer(const char __user *buf, size_t len) if (unlikely(!data)) return ERR_PTR(-ENOMEM); - if (unlikely(__copy_from_user(data, buf, len))) { + if (unlikely(copy_from_user(data, buf, len))) { kfree(data); return ERR_PTR(-EFAULT); } |