diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /drivers/rtc/rtc-omap.c | |
| parent | 7142d17e8f935fa842e9f6eece2281b6d41625d6 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'drivers/rtc/rtc-omap.c')
| -rw-r--r-- | drivers/rtc/rtc-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index de0dd7b1f146..bcae8dd41496 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
| @@ -394,7 +394,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) | |||
| 394 | return 0; | 394 | return 0; |
| 395 | 395 | ||
| 396 | fail2: | 396 | fail2: |
| 397 | free_irq(omap_rtc_timer, NULL); | 397 | free_irq(omap_rtc_timer, rtc); |
| 398 | fail1: | 398 | fail1: |
| 399 | rtc_device_unregister(rtc); | 399 | rtc_device_unregister(rtc); |
| 400 | fail0: | 400 | fail0: |