diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 10:56:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 10:56:46 -0700 |
| commit | 4ae0ff16efeffe7d06726fd3022cdb2f3e9e6892 (patch) | |
| tree | 005e974503185dd221b91299084f6595b5ba60e9 /drivers/rtc/rtc-omap.c | |
| parent | 96ad9999185363a1520434bdc6a775bbb27621f1 (diff) | |
| parent | 2dd93c4f47d506c586b827d75646a4257aafa43e (diff) | |
Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
RTC: rtc-omap: Fix a leak of the IRQ during init failure
posix clocks: Replace mutex with reader/writer semaphore
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 de0dd7b1f14..bcae8dd4149 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) return 0; fail2: - free_irq(omap_rtc_timer, NULL); + free_irq(omap_rtc_timer, rtc); fail1: rtc_device_unregister(rtc); fail0: |