diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-01-11 13:11:08 +0100 |
|---|---|---|
| committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2017-01-12 10:05:04 +0200 |
| commit | 32856eea7bf75dfb99b955ada6e147f553a11366 (patch) | |
| tree | 066483e73bb31b1ba14beafc8b296ca8edfb2c08 | |
| parent | 8ae584d1951f241efd45499f8774fd7066f22823 (diff) | |
| download | linux-stable-32856eea7bf75dfb99b955ada6e147f553a11366.tar.gz linux-stable-32856eea7bf75dfb99b955ada6e147f553a11366.tar.bz2 linux-stable-32856eea7bf75dfb99b955ada6e147f553a11366.zip | |
usb: gadget: udc: atmel: remove memory leak
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>
| -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 f3212db9bc37..12c7687216e6 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 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 { void __iomem *ep_regs; void __iomem *dma_regs; void __iomem *fifo; + char name[8]; struct usb_ep ep; struct usba_udc *udc; |