diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-03-16 20:48:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 07:43:39 -0400 |
commit | ce7aeffe7596343fce49307f374444b199b950a1 (patch) | |
tree | 12cadeda0d2216187b417910851630e04567659d | |
parent | 4fa1c65cf040a933ee8d2d0d1c0df83361add7ab (diff) |
usb: gadget: udc: atmel: remove memory leak
[ Upstream commit 32856eea7bf75dfb99b955ada6e147f553a11366 ]
Commit bbe097f092b0 ("usb: gadget: udc: atmel: fix endpoint name")
introduced a memory leak when unbinding the driver. The endpoint names
would not be freed. Solve that by including the name as a string in struct
usba_ep so it is freed when the endpoint is.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 45bc997d0711..a95b3e75f750 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, | |||
1978 | dev_err(&pdev->dev, "of_probe: name error(%d)\n", ret); | 1978 | dev_err(&pdev->dev, "of_probe: name error(%d)\n", ret); |
1979 | goto err; | 1979 | goto err; |
1980 | } | 1980 | } |
1981 | ep->ep.name = kasprintf(GFP_KERNEL, "ep%d", ep->index); | 1981 | sprintf(ep->name, "ep%d", ep->index); |
1982 | ep->ep.name = ep->name; | ||
1982 | 1983 | ||
1983 | ep->ep_regs = udc->regs + USBA_EPT_BASE(i); | 1984 | ep->ep_regs = udc->regs + USBA_EPT_BASE(i); |
1984 | ep->dma_regs = udc->regs + USBA_DMA_BASE(i); | 1985 | 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 3e1c9d589dfa..b03b2ebfc53a 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 { | |||
280 | void __iomem *ep_regs; | 280 | void __iomem *ep_regs; |
281 | void __iomem *dma_regs; | 281 | void __iomem *dma_regs; |
282 | void __iomem *fifo; | 282 | void __iomem *fifo; |
283 | char name[8]; | ||
283 | struct usb_ep ep; | 284 | struct usb_ep ep; |
284 | struct usba_udc *udc; | 285 | struct usba_udc *udc; |
285 | 286 | ||