Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cs5535-clockevt: Free timer in IRQ setup error path

Browse Source 
Due to a hardware limitation cs5535_mfgpt_free_timer() cannot actually
release the timer hardware, but it will at least free the now unreferenced
struct associated with it so calling it is the cleaner thing to do.

Signed-off-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
Acked-by: Andres Salomon <dilinger@collabora.co.uk>
Cc: Jordan Crouse <jordan@cosmicpenguin.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jens Rottmann 2010-03-11 14:04:44 -08:00 committed by Thomas Gleixner
parent 522dba7134
commit fdb19a6cb4
1 changed files with 5 additions and 3 deletions
Show Stats 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;
} }