OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[uclinux-h8/linux.git]
/
drivers
/
clk
/
at91
/
clk-main.c
diff --git
a/drivers/clk/at91/clk-main.c
b/drivers/clk/at91/clk-main.c
index
c240045
..
27dfa96
100644
(file)
--- a/
drivers/clk/at91/clk-main.c
+++ b/
drivers/clk/at91/clk-main.c
@@
-171,8
+171,10
@@
at91_clk_register_main_osc(struct at91_pmc *pmc,
irq_set_status_flags(osc->irq, IRQ_NOAUTOEN);
ret = request_irq(osc->irq, clk_main_osc_irq_handler,
IRQF_TRIGGER_HIGH, name, osc);
- if (ret)
+ if (ret) {
+ kfree(osc);
return ERR_PTR(ret);
+ }
if (bypass)
pmc_write(pmc, AT91_CKGR_MOR,