diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:23:57 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:23:57 +1100 |
| commit | 2a859ab07b6ab66f4134c4fffc341398bd3d328c (patch) | |
| tree | c5e7eaf3bffbc18feb326940e39794328d98dc07 /drivers/rtc/rtc-imxdi.c | |
| parent | cedddd812a79a4fda3885a15711aee3de78c4a24 (diff) | |
| parent | e716e014384688d1a50d1aa5213ee74748c6d4e0 (diff) | |
| download | kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.tar.gz kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.tar.bz2 kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.zip | |
Merge branch 'merge' into next
Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...
Diffstat (limited to 'drivers/rtc/rtc-imxdi.c')
| -rw-r--r-- | drivers/rtc/rtc-imxdi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c index 891cd6c61d0a..4eed51044c5d 100644 --- a/drivers/rtc/rtc-imxdi.c +++ b/drivers/rtc/rtc-imxdi.c @@ -392,6 +392,8 @@ static int dryice_rtc_probe(struct platform_device *pdev) if (imxdi->ioaddr == NULL) return -ENOMEM; + spin_lock_init(&imxdi->irq_lock); + imxdi->irq = platform_get_irq(pdev, 0); if (imxdi->irq < 0) return imxdi->irq; |