lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2010-05-19 17:10:57 -07:00
parent 6fa0fddd5f fdb19a6cb4
commit 5bfec46baa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clocksource/cs5535-clockevt.c
View File

@@ -154,14 +154,14 @@ static int __init cs5535_mfgpt_init(void)
if (cs5535_mfgpt_setup_irq(timer, MFGPT_CMP2, &timer_irq)) { if (cs5535_mfgpt_setup_irq(timer, MFGPT_CMP2, &timer_irq)) {
printk(KERN_ERR DRV_NAME ": Could not set up IRQ %d\n", printk(KERN_ERR DRV_NAME ": Could not set up IRQ %d\n",
timer_irq); timer_irq);
return -EIO; goto err_timer;
} }
/* And register it with the kernel */ /* And register it with the kernel */
ret = setup_irq(timer_irq, &mfgptirq); ret = setup_irq(timer_irq, &mfgptirq);
if (ret) { if (ret) {
printk(KERN_ERR DRV_NAME ": Unable to set up the interrupt.\n"); printk(KERN_ERR DRV_NAME ": Unable to set up the interrupt.\n");
goto err; goto err_irq;
} }
/* Set the clock scale and enable the event mode for CMP2 */ /* Set the clock scale and enable the event mode for CMP2 */
@@ -184,8 +184,10 @@ static int __init cs5535_mfgpt_init(void)
return 0; return 0;
err: err_irq:
cs5535_mfgpt_release_irq(cs5535_event_clock, MFGPT_CMP2, &timer_irq); cs5535_mfgpt_release_irq(cs5535_event_clock, MFGPT_CMP2, &timer_irq);
err_timer:
cs5535_mfgpt_free_timer(cs5535_event_clock);
printk(KERN_ERR DRV_NAME ": Unable to set up the MFGPT clock source\n"); printk(KERN_ERR DRV_NAME ": Unable to set up the MFGPT clock source\n");
return -EIO; return -EIO;
} }