diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:10:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:10:57 -0400 |
commit | 5bfec46baa3a752393433b8d89d3b2c70820f61d (patch) | |
tree | 62bcf1a1e43de6cb1721feb1861bdf7ee70007ff /drivers | |
parent | 6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1 (diff) | |
parent | fdb19a6cb48407c59a2007063f4005c9384603c3 (diff) |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
cs5535-clockevt: Free timer in IRQ setup error path
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clocksource/cs5535-clockevt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c index b314a999aabe..d7be69f13154 100644 --- a/drivers/clocksource/cs5535-clockevt.c +++ b/drivers/clocksource/cs5535-clockevt.c | |||
@@ -154,14 +154,14 @@ static int __init cs5535_mfgpt_init(void) | |||
154 | if (cs5535_mfgpt_setup_irq(timer, MFGPT_CMP2, &timer_irq)) { | 154 | if (cs5535_mfgpt_setup_irq(timer, MFGPT_CMP2, &timer_irq)) { |
155 | printk(KERN_ERR DRV_NAME ": Could not set up IRQ %d\n", | 155 | printk(KERN_ERR DRV_NAME ": Could not set up IRQ %d\n", |
156 | timer_irq); | 156 | timer_irq); |
157 | return -EIO; | 157 | goto err_timer; |
158 | } | 158 | } |
159 | 159 | ||
160 | /* And register it with the kernel */ | 160 | /* And register it with the kernel */ |
161 | ret = setup_irq(timer_irq, &mfgptirq); | 161 | ret = setup_irq(timer_irq, &mfgptirq); |
162 | if (ret) { | 162 | if (ret) { |
163 | printk(KERN_ERR DRV_NAME ": Unable to set up the interrupt.\n"); | 163 | printk(KERN_ERR DRV_NAME ": Unable to set up the interrupt.\n"); |
164 | goto err; | 164 | goto err_irq; |
165 | } | 165 | } |
166 | 166 | ||
167 | /* Set the clock scale and enable the event mode for CMP2 */ | 167 | /* Set the clock scale and enable the event mode for CMP2 */ |
@@ -184,8 +184,10 @@ static int __init cs5535_mfgpt_init(void) | |||
184 | 184 | ||
185 | return 0; | 185 | return 0; |
186 | 186 | ||
187 | err: | 187 | err_irq: |
188 | cs5535_mfgpt_release_irq(cs5535_event_clock, MFGPT_CMP2, &timer_irq); | 188 | cs5535_mfgpt_release_irq(cs5535_event_clock, MFGPT_CMP2, &timer_irq); |
189 | err_timer: | ||
190 | cs5535_mfgpt_free_timer(cs5535_event_clock); | ||
189 | printk(KERN_ERR DRV_NAME ": Unable to set up the MFGPT clock source\n"); | 191 | printk(KERN_ERR DRV_NAME ": Unable to set up the MFGPT clock source\n"); |
190 | return -EIO; | 192 | return -EIO; |
191 | } | 193 | } |