diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2014-06-29 16:01:10 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-06-30 12:53:38 -0500 |
| commit | e176475daa9a0b99d7e01bcfa24c7800400a9cdc (patch) | |
| tree | 8eee8684151b1cf6c7eb44d8b73015d07600442b /drivers/usb/gadget/pxa27x_udc.c | |
| parent | aa491320f4fb00f4ff6b67790bc75a96f6eb7790 (diff) | |
| download | op-kernel-dev-e176475daa9a0b99d7e01bcfa24c7800400a9cdc.zip op-kernel-dev-e176475daa9a0b99d7e01bcfa24c7800400a9cdc.tar.gz | |
usb: gadget: pxa27x_udc: prepare and unprepare the clock
Add clock prepare and unprepare as required by clock framework.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.c')
| -rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index cdf4d67..597d39f89 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -2446,6 +2446,9 @@ static int pxa_udc_probe(struct platform_device *pdev) retval = PTR_ERR(udc->clk); goto err_clk; } + retval = clk_prepare(udc->clk); + if (retval) + goto err_clk_prepare; retval = -ENOMEM; udc->regs = ioremap(regs->start, resource_size(regs)); @@ -2483,6 +2486,8 @@ err_add_udc: err_irq: iounmap(udc->regs); err_map: + clk_unprepare(udc->clk); +err_clk_prepare: clk_put(udc->clk); udc->clk = NULL; err_clk: @@ -2509,6 +2514,7 @@ static int pxa_udc_remove(struct platform_device *_dev) udc->transceiver = NULL; the_controller = NULL; + clk_unprepare(udc->clk); clk_put(udc->clk); iounmap(udc->regs); |
