projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa49132
)
usb: gadget: pxa27x_udc: prepare and unprepare the clock
author
Robert Jarzmik
<
[email protected]
>
Sun, 29 Jun 2014 14:01:10 +0000
(16:01 +0200)
committer
Felipe Balbi
<
[email protected]
>
Mon, 30 Jun 2014 17:53:38 +0000
(12:53 -0500)
Add clock prepare and unprepare as required by clock framework.
Signed-off-by: Robert Jarzmik <
[email protected]
>
Signed-off-by: Felipe Balbi <
[email protected]
>
drivers/usb/gadget/pxa27x_udc.c
patch
|
blob
|
history
diff --git
a/drivers/usb/gadget/pxa27x_udc.c
b/drivers/usb/gadget/pxa27x_udc.c
index cdf4d678be9638c1edaa230760b487740a5f0bf6..597d39f89420e3b4eb6c7b629a01f31ce52ffe5d 100644
(file)
--- 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);