diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 09:20:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 09:20:49 +0100 |
| commit | 692665c621bb73f298d37bf6c6dad47ef94a5c2b (patch) | |
| tree | e8a304fb67125cbae6403434edc424b77efcaf97 /drivers/usb/gadget/udc | |
| parent | afa197e3cb240fdd6194dd4c8545cdd45c82770e (diff) | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| download | op-kernel-dev-692665c621bb73f298d37bf6c6dad47ef94a5c2b.zip op-kernel-dev-692665c621bb73f298d37bf6c6dad47ef94a5c2b.tar.gz | |
Merge 4.10-rc5 into usb-next
We need the USB fixes in here as well to handle future merge issues and
dependancies.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/udc')
| -rw-r--r-- | drivers/usb/gadget/udc/atmel_usba_udc.c | 3 | ||||
| -rw-r--r-- | drivers/usb/gadget/udc/atmel_usba_udc.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index f3212db..12c7687 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -1978,7 +1978,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, dev_err(&pdev->dev, "of_probe: name error(%d)\n", ret); goto err; } - ep->ep.name = kasprintf(GFP_KERNEL, "ep%d", ep->index); + sprintf(ep->name, "ep%d", ep->index); + ep->ep.name = ep->name; ep->ep_regs = udc->regs + USBA_EPT_BASE(i); ep->dma_regs = udc->regs + USBA_DMA_BASE(i); diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h index 3e1c9d5..b03b2eb 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.h +++ b/drivers/usb/gadget/udc/atmel_usba_udc.h @@ -280,6 +280,7 @@ struct usba_ep { void __iomem *ep_regs; void __iomem *dma_regs; void __iomem *fifo; + char name[8]; struct usb_ep ep; struct usba_udc *udc; |
