diff options
Diffstat (limited to 'kernel/drivers/usb/gadget/udc')
-rw-r--r-- | kernel/drivers/usb/gadget/udc/mv_udc_core.c | 2 | ||||
-rw-r--r-- | kernel/drivers/usb/gadget/udc/udc-core.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/drivers/usb/gadget/udc/mv_udc_core.c b/kernel/drivers/usb/gadget/udc/mv_udc_core.c index d32160d64..5da37c957 100644 --- a/kernel/drivers/usb/gadget/udc/mv_udc_core.c +++ b/kernel/drivers/usb/gadget/udc/mv_udc_core.c @@ -2167,7 +2167,7 @@ static int mv_udc_probe(struct platform_device *pdev) return -ENODEV; } - udc->phy_regs = ioremap(r->start, resource_size(r)); + udc->phy_regs = devm_ioremap(&pdev->dev, r->start, resource_size(r)); if (udc->phy_regs == NULL) { dev_err(&pdev->dev, "failed to map phy I/O memory\n"); return -EBUSY; diff --git a/kernel/drivers/usb/gadget/udc/udc-core.c b/kernel/drivers/usb/gadget/udc/udc-core.c index d69c35558..7d69931cf 100644 --- a/kernel/drivers/usb/gadget/udc/udc-core.c +++ b/kernel/drivers/usb/gadget/udc/udc-core.c @@ -321,6 +321,7 @@ err4: err3: put_device(&udc->dev); + device_del(&gadget->dev); err2: put_device(&gadget->dev); |