diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-11-15 20:30:53 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-11-15 20:31:29 -0800 |
| commit | 617f41836c17688141e1c66f4156c2084f8ca86d (patch) | |
| tree | e57d631bb3bb061a0ff2e99bc85f94bd1c30598f /drivers/usb/gadget/udc/gr_udc.c | |
| parent | 26add94cd535d1e000e7871fe69c7bb89e942d67 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
Merge v4.4-rc1 into MTD development
Sync up with the upstream development.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/usb/gadget/udc/gr_udc.c')
| -rw-r--r-- | drivers/usb/gadget/udc/gr_udc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c index 8aa2593c2c36..b9429bc42511 100644 --- a/drivers/usb/gadget/udc/gr_udc.c +++ b/drivers/usb/gadget/udc/gr_udc.c @@ -2117,8 +2117,7 @@ static int gr_remove(struct platform_device *pdev) return -EBUSY; gr_dfs_delete(dev); - if (dev->desc_pool) - dma_pool_destroy(dev->desc_pool); + dma_pool_destroy(dev->desc_pool); platform_set_drvdata(pdev, NULL); gr_free_request(&dev->epi[0].ep, &dev->ep0reqi->req); |