Commit ce7aeffe authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Greg Kroah-Hartman

usb: gadget: udc: atmel: remove memory leak

[ Upstream commit 32856eea ]

Commit bbe097f0 ("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: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4fa1c65c
...@@ -1978,7 +1978,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, ...@@ -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); dev_err(&pdev->dev, "of_probe: name error(%d)\n", ret);
goto err; 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->ep_regs = udc->regs + USBA_EPT_BASE(i);
ep->dma_regs = udc->regs + USBA_DMA_BASE(i); ep->dma_regs = udc->regs + USBA_DMA_BASE(i);
......
...@@ -280,6 +280,7 @@ struct usba_ep { ...@@ -280,6 +280,7 @@ struct usba_ep {
void __iomem *ep_regs; void __iomem *ep_regs;
void __iomem *dma_regs; void __iomem *dma_regs;
void __iomem *fifo; void __iomem *fifo;
char name[8];
struct usb_ep ep; struct usb_ep ep;
struct usba_udc *udc; struct usba_udc *udc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment