summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2008-08-20 14:09:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-20 15:40:30 -0700
commit8c9166f7a60b67909632ea60a032c18d84ed8af0 (patch)
treef7dd0167fb02449a35a91b2d2af2ec2e94a9b97d
parentfe2e1cf83a46c879a66ec5146ba7a09a6aef0a5c (diff)
downloadlinux-3.10-8c9166f7a60b67909632ea60a032c18d84ed8af0.tar.gz
linux-3.10-8c9166f7a60b67909632ea60a032c18d84ed8af0.tar.bz2
linux-3.10-8c9166f7a60b67909632ea60a032c18d84ed8af0.zip
Blackfin RTC Driver: do all initialization before we register the rtc and make it available
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-bfin.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index 51741dc1291..9d2da1cd777 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -371,6 +371,7 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
if (unlikely(!rtc))
return -ENOMEM;
platform_set_drvdata(pdev, rtc);
+ device_init_wakeup(dev, 1);
/* Grab the IRQ and init the hardware */
ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, pdev->name, dev);
@@ -386,8 +387,6 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
goto err_irq;
}
- device_init_wakeup(dev, 1);
-
return 0;
err_irq: