diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
| commit | 4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch) | |
| tree | b3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /drivers/rtc/rtc-omap.c | |
| parent | 751e1f5099f1568444fe2485f2485ca541d4952e (diff) | |
| parent | c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff) | |
Merge branch 'merge' into next
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: |